Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Mon, 12 Apr 2010 12:55:28 +0000 (14:55 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Mon, 12 Apr 2010 12:55:28 +0000 (14:55 +0200)
commit957f36cb498657f94f1b5b92f52713254ff8c051
tree2f5eb7274d87308a365ae18d91d79c80af45c333
parent1bcbd8aa87db82f045b935861510ee7480578f04
parenta46b1d4060fd392c10d6c55d51f536ba92d9f5c3
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Improved support for OPTION and LINKEROPTION statements in MMP files