summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/VERSION
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2010-02-15 08:24:36 (GMT)
committerAlan Alpert <alan.alpert@nokia.com>2010-02-15 08:24:36 (GMT)
commit22157cb26419ddcaa927cbfa88ad04486b1d1ee0 (patch)
treef84ff6878248c791319fc6be1f1956f2177b5bdb /src/3rdparty/webkit/VERSION
parentfa6dc19b9212706532f3f88da0fb3542e9c3eafe (diff)
parenta14b8805945c5e00be26092406a468fd8b8acc14 (diff)
downloadQt-22157cb26419ddcaa927cbfa88ad04486b1d1ee0.zip
Qt-22157cb26419ddcaa927cbfa88ad04486b1d1ee0.tar.gz
Qt-22157cb26419ddcaa927cbfa88ad04486b1d1ee0.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
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 4348cbc..cc0e04f 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
- da5d96a26e80162027bc95ce7e5725fe4b277ff7
+ ffae5e11181a3961193fa21ea405851cad714d4b