diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-11 04:30:19 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-11 04:30:19 (GMT) |
commit | f11bdd5bd0b46f759e4711de1c2c3ef5006433fa (patch) | |
tree | 6bc60f56535997a0a25f9a992f7dccc4fd421262 /config.tests/unix/opengles1 | |
parent | 9c45f9ac644adf44fecb48e2c4ea44fca809bc7d (diff) | |
parent | d30334bfdf5a05d6ea3c68e4014ce8f8d66f3876 (diff) | |
download | Qt-f11bdd5bd0b46f759e4711de1c2c3ef5006433fa.zip Qt-f11bdd5bd0b46f759e4711de1c2c3ef5006433fa.tar.gz Qt-f11bdd5bd0b46f759e4711de1c2c3ef5006433fa.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Revert accidental commit
Rework threading internals in XmlListModel to avoid global static
Diffstat (limited to 'config.tests/unix/opengles1')
0 files changed, 0 insertions, 0 deletions