Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Fri, 13 Aug 2010 04:21:21 +0000 (06:21 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 13 Aug 2010 04:21:21 +0000 (06:21 +0200)
commit550ac75e1639362010e8c24010a8b541a83d8512
tree8fd46e0a8fbd83c5bd1bc7ba236c07e3a8b2d32d
parent1534ac035f0dc5ca82e84ecbb79d2f50e689e34a
parent36a98407ce53e2d7ae6f1ef3b65794b113ae1606
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Update changes-4.6.4 with recent shader program changes