Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team
authorQt Continuous Integration System <qt-info@nokia.com>
Fri, 13 May 2011 04:14:30 +0000 (14:14 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 13 May 2011 04:14:30 +0000 (14:14 +1000)
commit8592bcc80b7ec245b485fa54f8bd41c4484e93e0
tree3cda496d06c89d337e37583df6d9af8546c30124
parent85b089dec584fcc51ad7703ea015ea724c132ed4
parent2caea6081fc46217636f0ab70d09891efd2d2864
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team:
  Fixed license header.
  Ensure that recursive QMAKE_EXTRA_TARGETS use the correct makefile