summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-01-28 06:54:48 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-01-28 06:54:48 (GMT)
commit7633b27e1216690ff0f51b316236ba0f5b95664d (patch)
treefac071e2ac013fed9f60c2f9e0e52299556dcd07 /tools
parent692e12b928fa94209a38afc7693be3469bc57039 (diff)
parent6b6b206ed8634323570712e003fc159fbf5f8303 (diff)
downloadQt-7633b27e1216690ff0f51b316236ba0f5b95664d.zip
Qt-7633b27e1216690ff0f51b316236ba0f5b95664d.tar.gz
Qt-7633b27e1216690ff0f51b316236ba0f5b95664d.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: Better support for user-generated binary shaders
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions