summaryrefslogtreecommitdiffstats
path: root/DEPS
diff options
context:
space:
mode:
authorlevin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-06 09:14:21 +0000
committerlevin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-06 09:14:21 +0000
commite598ad77dddb4046be70be45afaec8ab93c8f03b (patch)
tree357503174606b6b5e899f3da2428f23543244273 /DEPS
parentaa27148007a9ee460f4e5027fe8d3db7c3fc7246 (diff)
downloadchromium_src-e598ad77dddb4046be70be45afaec8ab93c8f03b.zip
chromium_src-e598ad77dddb4046be70be45afaec8ab93c8f03b.tar.gz
chromium_src-e598ad77dddb4046be70be45afaec8ab93c8f03b.tar.bz2
WebKit merge 40539:40668 [chromium side]
Just adding and removing files corresponding to what has been done in webkit, and one test regression. Review URL: http://codereview.chromium.org/21124 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9311 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'DEPS')
-rw-r--r--DEPS4
1 files changed, 2 insertions, 2 deletions
diff --git a/DEPS b/DEPS
index 47bffc6..f9f968a 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "40539",
+ "webkit_revision": "40668",
}
@@ -19,7 +19,7 @@ deps = {
"http://googletest.googlecode.com/svn/trunk@167",
"src/third_party/WebKit":
- "/trunk/deps/third_party/WebKit@9279",
+ "/trunk/deps/third_party/WebKit@9310",
"src/third_party/icu38":
"/trunk/deps/third_party/icu38@9252",