diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-04 15:02:20 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-04 15:02:20 (GMT) |
commit | d494f2312d24805c6e9cf49101cf54dc8dc8bef7 (patch) | |
tree | 333ce1713bb816d5ad6c3e7564944415d8bd953b /doc/src/snippets/code/src_script_qscriptengine.cpp | |
parent | 3cd611df87645df05fcc747ebb5dcebff05132e4 (diff) | |
parent | 1cfc49a59eaa54fa8060530e585052d41fd58cad (diff) | |
download | Qt-d494f2312d24805c6e9cf49101cf54dc8dc8bef7.zip Qt-d494f2312d24805c6e9cf49101cf54dc8dc8bef7.tar.gz Qt-d494f2312d24805c6e9cf49101cf54dc8dc8bef7.tar.bz2 |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Revert "Temporarily disable tests that use createNtfsJunction()"
Diffstat (limited to 'doc/src/snippets/code/src_script_qscriptengine.cpp')
0 files changed, 0 insertions, 0 deletions