summaryrefslogtreecommitdiff
path: root/Source/WebKit/chromium
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2012-08-23 17:14:29 +0200
committerSimon Hausmann <simon.hausmann@nokia.com>2012-08-23 17:14:29 +0200
commitf53e6f8e798362ed712d4a51633b0d0b03dbc213 (patch)
treefba2c4b05f1b11f491c6f0fbbd86e72b5f436cb0 /Source/WebKit/chromium
parent10ca2fc7fb098f16b107e991f6b38e703282d9c7 (diff)
downloadqtwebkit-f53e6f8e798362ed712d4a51633b0d0b03dbc213.tar.gz
Imported WebKit commit fec2bcfbf5f908f789763ed3b3b971e2330e2a1a (http://svn.webkit.org/repository/webkit/trunk@126428)
New snapshot that contains the same fixes upstream as well as a non-qml2 build fix
Diffstat (limited to 'Source/WebKit/chromium')
-rw-r--r--Source/WebKit/chromium/ChangeLog6
-rw-r--r--Source/WebKit/chromium/DEPS2
2 files changed, 7 insertions, 1 deletions
diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
index 41b2bb936..396cc1114 100644
--- a/Source/WebKit/chromium/ChangeLog
+++ b/Source/WebKit/chromium/ChangeLog
@@ -1,3 +1,9 @@
+2012-08-23 Peter Beverloo <peter@chromium.org>
+
+ Unreviewed. Rolled DEPS.
+
+ * DEPS:
+
2012-08-22 Alec Flett <alecflett@chromium.org>
IndexedDB: tests for injection/extraction of idb keys
diff --git a/Source/WebKit/chromium/DEPS b/Source/WebKit/chromium/DEPS
index e232a71c2..6322e4843 100644
--- a/Source/WebKit/chromium/DEPS
+++ b/Source/WebKit/chromium/DEPS
@@ -32,7 +32,7 @@
vars = {
'chromium_svn': 'http://src.chromium.org/svn/trunk/src',
- 'chromium_rev': '152728'
+ 'chromium_rev': '152985'
}
deps = {