summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/VERSION
diff options
context:
space:
mode:
authorMartin Smith <msmith@trolltech.com>2010-01-04 08:48:39 (GMT)
committerMartin Smith <msmith@trolltech.com>2010-01-04 08:48:39 (GMT)
commitc855c61ed5c80a97f3a2858a15453f9e041db7f8 (patch)
tree68b86fe5adc7a5c19a237ee1e5bba147ccf92f23 /src/3rdparty/webkit/VERSION
parent65a0c8cc6d2c13cfb2cef22e8a23f4e3050fde25 (diff)
parent06bdf48e9194d73075041efecde5c70a144d6927 (diff)
downloadQt-c855c61ed5c80a97f3a2858a15453f9e041db7f8.zip
Qt-c855c61ed5c80a97f3a2858a15453f9e041db7f8.tar.gz
Qt-c855c61ed5c80a97f3a2858a15453f9e041db7f8.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 62acbdf..daa3be7 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
- 9de63cde0ac8aa08e207d4ffce2846df1a44a364
+ 70b5989bdeea2f73bd950099fc0f0e954550ef54