summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/VERSION
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-05-15 03:51:59 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-05-15 03:51:59 (GMT)
commit6100e83f3cbf40199da3078c1954a4dc1f77cb8f (patch)
tree6edd81c644b2d34f12e245743282d59cc128e3f1 /src/3rdparty/webkit/VERSION
parent0540bd988196dd7f34b755f401927080e8503136 (diff)
parent517d000e80c5d1c497bb21875b19285c30ef5850 (diff)
downloadQt-6100e83f3cbf40199da3078c1954a4dc1f77cb8f.zip
Qt-6100e83f3cbf40199da3078c1954a4dc1f77cb8f.tar.gz
Qt-6100e83f3cbf40199da3078c1954a4dc1f77cb8f.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 5cf023650a8da206a8cf3130e9d4820b95e1bc7c Updated WebKit to 57d10d5c05e59bbf7de8189ff47dd18d1be996dc
Diffstat (limited to 'src/3rdparty/webkit/VERSION')
-rw-r--r--src/3rdparty/webkit/VERSION2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION
index c8c2aa3..a440c03 100644
--- a/src/3rdparty/webkit/VERSION
+++ b/src/3rdparty/webkit/VERSION
@@ -4,4 +4,4 @@ This is a snapshot of the Qt port of WebKit from
and has the sha1 checksum
- dc5821c3df2ef60456d85263160852f5335cf946
+ 5cf023650a8da206a8cf3130e9d4820b95e1bc7c