Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integr...
authorQt Continuous Integration System <qt-info@nokia.com>
Thu, 19 May 2011 19:17:58 +0000 (05:17 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 19 May 2011 19:17:58 +0000 (05:17 +1000)
commit4ae323abfec7f703120c1c425ea78b367578d2b8
tree2278810091add0dc71edb41bfb2155ff5fd44661
parent55dadee60cb74cf758ad962654a066314979bfdc
parentd2d7aef223a3bad368c6b7c7f7f4617f4acf323c
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
  Fixed compile of qdrawhelper_neon.cpp.