projects / profile / ivi / qtbase.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 664517a 152a100)
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
authorQt Continuous Integration System <qt-info@nokia.com>
Thu, 12 May 2011 23:05:00 +0000 (09:05 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 12 May 2011 23:05:00 +0000 (09:05 +1000)
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Ensure that recursive QMAKE_EXTRA_TARGETS use the correct makefile


Trivial merge
Domain: UI Framework / Uncategorized;