Skip to content
GitLab
Commit e7395b80 authored by Qt Continuous Integration System's avatar Qt Continuous Integration System
Browse files

Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qttools-staging 

* 'master' of git://scm.dev.nokia.troll.no/qt/qttools-staging:
  Squashed commit of changes from the 4.8-temp branch.
  Squashed commit of the changes from the mobile-examples repository (4.7-generated-declarative branch). (cherry picked from commit 539311f7b2687e3148ea695ce06fee768abe7b44)
parents 68c94ef3 95df4086
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 137 additions and 0 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment