summaryrefslogtreecommitdiffstats
path: root/src/imports
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-03-02 21:12:22 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-03-02 21:12:22 (GMT)
commit5414957f0feebe24a2aa0ac7c5ec32e53e49b57a (patch)
treeec24257d3e8450c8e3f0e3b6c3ab79e3b1ed0dd9 /src/imports
parentef0fb5a95971285ed60530bf399c7eb038bf2977 (diff)
parent42960ef148fe912226813371ae98c31d7bd1fd1d (diff)
downloadQt-5414957f0feebe24a2aa0ac7c5ec32e53e49b57a.zip
Qt-5414957f0feebe24a2aa0ac7c5ec32e53e49b57a.tar.gz
Qt-5414957f0feebe24a2aa0ac7c5ec32e53e49b57a.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging: Add qscriptobject and context2d to "trusted" benchmarks
Diffstat (limited to 'src/imports')
0 files changed, 0 insertions, 0 deletions