summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/VERSION
diff options
context:
space:
mode:
authorAndreas Kling <andreas.kling@nokia.com>2010-01-20 09:26:25 (GMT)
committerAndreas Kling <andreas.kling@nokia.com>2010-01-20 09:26:25 (GMT)
commit877d63b35b290649e745e08be104c81dc56a02b9 (patch)
tree6817a7001f20cbc9adb31844683122db03ed9fd0 /src/3rdparty/webkit/VERSION
parent01f733a64e45363e74bea62e4cae8a658bc09383 (diff)
parent2761e6f57ecd00c3435dbb8a6cf5f40653195d5d (diff)
downloadQt-877d63b35b290649e745e08be104c81dc56a02b9.zip
Qt-877d63b35b290649e745e08be104c81dc56a02b9.tar.gz
Qt-877d63b35b290649e745e08be104c81dc56a02b9.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
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 4f33e22..9dd9377 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
- 8f6992f4e8f027818429d428393b08068eca9ffa
+ e15bd5454732bab9ffff4e1e5a755f41fd4e2eff