projects / platform / upstream / qttools.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 68c94ef 95df408)
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qttools-staging
authorQt Continuous Integration System <qt-info@nokia.com>
Mon, 23 May 2011 12:55:05 +0000 (22:55 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Mon, 23 May 2011 12:55:05 +0000 (22:55 +1000)
* '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)


Trivial merge
Domain: UI Framework / Qt;