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>
Tue, 12 Oct 2010 14:35:18 +0000 (16:35 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 12 Oct 2010 14:35:18 +0000 (16:35 +0200)
commit8f114382b0e0f03ced3559604da41a01b44ecc66
treef37084a8896a9386819a1ba30c85d8d4cd3bb444
parentf863591b4e4aaddb65ea7119dda0d04aa13753b5
parent7ed040dd9f4769be9b254623d295aa93dbd569b8
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:
  Rename .pro file to match directory name.