summaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-06-14 01:31:47 +0200
committerQt Continuous Integration System <qt-info@nokia.com>2010-06-14 01:31:47 +0200
commitee60791655c3303e50cef4fc0ebd1ad644467fc8 (patch)
tree77a0354415deba1acb450e54b240860ed9660326 /tests/auto/declarative/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp
parent1c20abaaeef1ab448526e5821db06350537c1333 (diff)
parent5a90ecfd34f8959e73cc711337529ce8bada7aa2 (diff)
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 f943ead2759537527faa7f3cb057d995291663b9
Diffstat (limited to 'tests/auto/declarative/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp')
0 files changed, 0 insertions, 0 deletions