summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/VERSION
diff options
context:
space:
mode:
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>2010-04-12 12:23:40 (GMT)
committerEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>2010-04-12 12:23:40 (GMT)
commit0f790634c57400f4ddffd36f5e3443c712d1a1c3 (patch)
tree2b9f01a1798c5700f3c82e72a3db97dac6a625d5 /src/3rdparty/webkit/VERSION
parent67e8e5baeec38d592596f259894e6dda420728ea (diff)
parent119d7dddc8da189ccd1cbc55ed3292f311c30e0c (diff)
downloadQt-0f790634c57400f4ddffd36f5e3443c712d1a1c3.zip
Qt-0f790634c57400f4ddffd36f5e3443c712d1a1c3.tar.gz
Qt-0f790634c57400f4ddffd36f5e3443c712d1a1c3.tar.bz2
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
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 4de7ad8..7c9ea04 100644
--- a/src/3rdparty/webkit/VERSION
+++ b/src/3rdparty/webkit/VERSION
@@ -8,4 +8,4 @@ The commit imported was from the
and has the sha1 checksum
- ecfa4583e573ce4dff1f0df12f6bdba3022376e5
+ 14feb62c96ffe2c37e3e2fdac4e370fdbc76ef62