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>
Thu, 23 Dec 2010 05:01:54 +0000 (15:01 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 23 Dec 2010 05:01:54 +0000 (15:01 +1000)
commite6694ebe4081b807b1bb0946e17e73840019ec6d
tree8f1fd7968382583a9d550d339b8b6182ca9b3755
parent74a104ebca8c69381724271152914d7a2dfbe1da
parentbfd3a0d40932cb4ef2a35424a24e1961c3b21bb7
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:
  Improve performance of bilinear upscaling of images with neon.