summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/VERSION
diff options
context:
space:
mode:
Diffstat (limited to 'src/3rdparty/webkit/VERSION')
-rw-r--r--src/3rdparty/webkit/VERSION4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION
index cc0e04f..35511fb 100644
--- a/src/3rdparty/webkit/VERSION
+++ b/src/3rdparty/webkit/VERSION
@@ -4,8 +4,8 @@ This is a snapshot of the Qt port of WebKit from
The commit imported was from the
- qtwebkit/qtwebkit-4.6 branch/tag
+ qtwebkit-4.7-merged branch/tag
and has the sha1 checksum
- ffae5e11181a3961193fa21ea405851cad714d4b
+ 5381ceeb37d97365cfb2f037650dbb4e495bca4e