summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/VERSION
diff options
context:
space:
mode:
authorA-Team <ateam@pad.test.qt.nokia.com>2010-09-24 22:00:19 (GMT)
committerA-Team <ateam@pad.test.qt.nokia.com>2010-09-24 22:00:19 (GMT)
commit81d25b1c69dc186eaa3d3993e74ae132cc8f582a (patch)
tree7034202e9b2108c2d0ced275448e8ececf816612 /src/3rdparty/webkit/VERSION
parent84d278501a19eaccf9a77cccd95ca5d17a2dcd2b (diff)
parentf28d3e2f6c09abe7629779a8b10f3caa9007c468 (diff)
downloadQt-81d25b1c69dc186eaa3d3993e74ae132cc8f582a.zip
Qt-81d25b1c69dc186eaa3d3993e74ae132cc8f582a.tar.gz
Qt-81d25b1c69dc186eaa3d3993e74ae132cc8f582a.tar.bz2
Merge branch '4.7-upstream' into 4.7-doc
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 f919bdf..a270d56 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
- 715b53069911a31a559aa0b3d94ffc6a5ac20988
+ 6e15c3404d15a8ab72242152ec966e5e388161a2