summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-01-18 21:32:56 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-01-18 21:32:56 (GMT)
commitc9be4ccfbd63323a2d70d341c9bc490a95195148 (patch)
tree52b1265c42351c1c96050e6168958c9c1d3c7e8c /tests/auto
parentfe46e32bd7dc758ae755a221a937ed40e1a16462 (diff)
parente1ba2a3258277fc7811cad4bb27c52590b3966ec (diff)
downloadQt-c9be4ccfbd63323a2d70d341c9bc490a95195148.zip
Qt-c9be4ccfbd63323a2d70d341c9bc490a95195148.tar.gz
Qt-c9be4ccfbd63323a2d70d341c9bc490a95195148.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: Fix qmake project in QtScript benchmarks
Diffstat (limited to 'tests/auto')
0 files changed, 0 insertions, 0 deletions