summaryrefslogtreecommitdiffstats
path: root/config.tests
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-08-13 04:21:21 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-08-13 04:21:21 (GMT)
commit550ac75e1639362010e8c24010a8b541a83d8512 (patch)
tree8fd46e0a8fbd83c5bd1bc7ba236c07e3a8b2d32d /config.tests
parent1534ac035f0dc5ca82e84ecbb79d2f50e689e34a (diff)
parent36a98407ce53e2d7ae6f1ef3b65794b113ae1606 (diff)
downloadQt-550ac75e1639362010e8c24010a8b541a83d8512.zip
Qt-550ac75e1639362010e8c24010a8b541a83d8512.tar.gz
Qt-550ac75e1639362010e8c24010a8b541a83d8512.tar.bz2
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
Diffstat (limited to 'config.tests')
0 files changed, 0 insertions, 0 deletions