Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Mon, 6 Sep 2010 21:48:04 +0000 (23:48 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Mon, 6 Sep 2010 21:48:04 +0000 (23:48 +0200)
commit29536a20346784023a65ae198ed6cec820f51cf0
tree1fcc488384cb1cbba31e4285cdc8deb9859f2f0e
parent30f2580a7c1486f8239ac1c362f7ac485f5321f3
parent9cba567c9fb3243191735376a5de7962ad393952
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Allow Windows x64 to use SSE2 to speed up blending