summaryrefslogtreecommitdiffstats
path: root/DEPS
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-15 01:46:22 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-15 01:46:22 +0000
commit2b88c1810672ba8671da85b115089f8a562cf17f (patch)
tree47613a385df7c3ec00375ddb927b7e80b9c56213 /DEPS
parent3ef033d5dfc74064b75780ec16580705b46b81af (diff)
downloadchromium_src-2b88c1810672ba8671da85b115089f8a562cf17f.zip
chromium_src-2b88c1810672ba8671da85b115089f8a562cf17f.tar.gz
chromium_src-2b88c1810672ba8671da85b115089f8a562cf17f.tar.bz2
Chromium side of WebKit merge 39894:39913 plus a one-line fix from a more
recent WebKit revision in XMLTokenizerLibxml2.cpp to make it compile. Review URL: http://codereview.chromium.org/18075 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8068 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'DEPS')
-rw-r--r--DEPS8
1 files changed, 4 insertions, 4 deletions
diff --git a/DEPS b/DEPS
index 915bd51..1a38b86 100644
--- a/DEPS
+++ b/DEPS
@@ -12,7 +12,7 @@ deps = {
"http://googletest.googlecode.com/svn/trunk@167",
"src/third_party/WebKit":
- "/trunk/deps/third_party/WebKit@8041",
+ "/trunk/deps/third_party/WebKit@8053",
"src/third_party/icu38":
"/trunk/deps/third_party/icu38@7525",
@@ -21,13 +21,13 @@ deps = {
"http://v8.googlecode.com/svn/trunk@1040",
"src/webkit/data/layout_tests/LayoutTests":
- "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@39894",
+ "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@39913",
"src/third_party/WebKit/WebKit":
- "http://svn.webkit.org/repository/webkit/trunk/WebKit@39894",
+ "http://svn.webkit.org/repository/webkit/trunk/WebKit@39913",
"src/third_party/WebKit/WebKitLibraries":
- "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@39894",
+ "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@39913",
}