diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-05 07:18:55 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-05 07:18:55 (GMT) |
| commit | a8ba2f12d520ac5001f823ccf4f751c91bd105d5 (patch) | |
| tree | deba228c84474168c8f079ebe37e6c641bc8b170 /doc/src/snippets/code/src_script_qscriptengine.cpp | |
| parent | 3cd611df87645df05fcc747ebb5dcebff05132e4 (diff) | |
| parent | d873afaa7adfc5e633191332d0674aa1977904d1 (diff) | |
| download | Qt-a8ba2f12d520ac5001f823ccf4f751c91bd105d5.zip Qt-a8ba2f12d520ac5001f823ccf4f751c91bd105d5.tar.gz Qt-a8ba2f12d520ac5001f823ccf4f751c91bd105d5.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:
Sync against latest Qt Creator.
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