diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-26 12:01:36 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-26 12:01:36 (GMT) |
commit | f53f18d442629b859dd68ffbc2bae0ec104a9bd2 (patch) | |
tree | 095d85946674c2a56c2a552f4b5977f09dae16c7 /src/script/script.pri | |
parent | 8a6086b6cc7f535f12f4ac617a9634cf7417c6ff (diff) | |
parent | 3604c59a93eae6f27407316e5be3840f87d01711 (diff) | |
download | Qt-f53f18d442629b859dd68ffbc2bae0ec104a9bd2.zip Qt-f53f18d442629b859dd68ffbc2bae0ec104a9bd2.tar.gz Qt-f53f18d442629b859dd68ffbc2bae0ec104a9bd2.tar.bz2 |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Remove unwanted code after c027f0ae1967ec1d64cb2c9679c8b57f18faf7f5
ActiveQt Internet Explorer component causes Desktop Icons to flicker.
Diffstat (limited to 'src/script/script.pri')
0 files changed, 0 insertions, 0 deletions