summaryrefslogtreecommitdiffstats
path: root/tests/auto/q3dns
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-06-24 17:22:46 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-06-24 17:22:46 (GMT)
commit100a56f323a008edb0a451ab052f1a0d5edcc547 (patch)
tree8ab4e1e18c963cbbb4588e306ae04c670da323a0 /tests/auto/q3dns
parent73b5555277b2d5a6f752f44062b1a87e69abe756 (diff)
parent9dc6dc38bf9035ec6460fa20159c33d5ad7084ca (diff)
downloadQt-100a56f323a008edb0a451ab052f1a0d5edcc547.zip
Qt-100a56f323a008edb0a451ab052f1a0d5edcc547.tar.gz
Qt-100a56f323a008edb0a451ab052f1a0d5edcc547.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Updated WebKit to 2f598e9b7b376d851fe089bc1dc729bcf0393a06 Moved the QML WebKit integration into QtWebKit.sis
Diffstat (limited to 'tests/auto/q3dns')
0 files changed, 0 insertions, 0 deletions