summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/VERSION
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2010-02-02 13:12:51 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2010-02-02 13:12:51 (GMT)
commiteeaf1b14b45714cf2d7e447806f0893367dc4f6a (patch)
tree69d37edb0067bf60e2279ffe70cc88921a173c42 /src/3rdparty/webkit/VERSION
parent11d2c8f96697adc93ccd82e3db1de6ecde025eff (diff)
parent57d33781bd8e02904a85de7fc54f8f4e8bd299e6 (diff)
downloadQt-eeaf1b14b45714cf2d7e447806f0893367dc4f6a.zip
Qt-eeaf1b14b45714cf2d7e447806f0893367dc4f6a.tar.gz
Qt-eeaf1b14b45714cf2d7e447806f0893367dc4f6a.tar.bz2
Merge remote branch 'origin/4.6' into qt-master-from-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 221c020..2a3c73b 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
- a54fd11a3abcd6d9c858e8162e85fd1f3aa21db1
+ afc4c208fe296f5a1dd0e73f2bd1273bd22d9b24