diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-22 16:50:49 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-22 16:50:49 (GMT) |
commit | 4894e6dd57c31e0196c6fdae4d1b2fb16b9f1b16 (patch) | |
tree | 5920aa9d4a2d62670c7fdf29872685b94cc6bf5d /tests/auto/declarative/qdeclarativestates/data/basicExtension.qml | |
parent | 1c47be7174ca1e9ed393a12461742975079710d7 (diff) | |
parent | 70bafa8e138d938fd34736c46b015d88b5d7feef (diff) | |
download | Qt-4894e6dd57c31e0196c6fdae4d1b2fb16b9f1b16.zip Qt-4894e6dd57c31e0196c6fdae4d1b2fb16b9f1b16.tar.gz Qt-4894e6dd57c31e0196c6fdae4d1b2fb16b9f1b16.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
qdoc: Updated the extra images variable again, for each manual.qdocconf.
Revert "Add new QDataStream version for Qt 4.8."
Add new QDataStream version for Qt 4.8.
Fix URL for Qt Bug Tracker.
Diffstat (limited to 'tests/auto/declarative/qdeclarativestates/data/basicExtension.qml')
0 files changed, 0 insertions, 0 deletions