Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Wed, 16 Nov 2011 18:12:24 +0000 (04:12 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 16 Nov 2011 18:12:24 +0000 (04:12 +1000)
commitb0d54f150e9b4211e263b4835dd2c64ac07a8c86
tree2fd560a86cdd7e043c3cc6d317b9c232c670a7ed
parent23f3c60c42ffc42acee823ba8041b9474cc15133
parentff8486f8326e214faa08eacc8e91b5333d68e912
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Rebuild configure.exe with support for MinGW 4.6
  Windows: Add gcc 4.6.