summaryrefslogtreecommitdiffstats
path: root/src/corelib/io
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-12-15 22:10:06 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-12-15 22:10:06 (GMT)
commit0ef5464cc2c79d834f565153111d48ae63249b97 (patch)
tree57ac2bb3463c68e7f25712e082f1a78cc90ee081 /src/corelib/io
parentbf6ddf2631fbad3b7f1bac6469771910451bf84d (diff)
parent017a5cfc6462317e6cca0f04a8339e2575bb9130 (diff)
downloadQt-0ef5464cc2c79d834f565153111d48ae63249b97.zip
Qt-0ef5464cc2c79d834f565153111d48ae63249b97.tar.gz
Qt-0ef5464cc2c79d834f565153111d48ae63249b97.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Satisfy the maketestselftest autotst Make the lancelot/baseline test system generically usable Make protocol less lancelot-specific, prepare use in other testcases Added new View command on reports Avoid race condition: don't quit until new executable is ready
Diffstat (limited to 'src/corelib/io')
0 files changed, 0 insertions, 0 deletions