summaryrefslogtreecommitdiffstats
path: root/DEPS
diff options
context:
space:
mode:
authorericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-12 05:23:18 +0000
committerericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-12 05:23:18 +0000
commit7bee1e113242a39b41579e07cd83e41591595eab (patch)
treef320d48370987003284f426ab7833defe1579656 /DEPS
parent140932f7da2921aeecc32015d05168c3c514eef8 (diff)
downloadchromium_src-7bee1e113242a39b41579e07cd83e41591595eab.zip
chromium_src-7bee1e113242a39b41579e07cd83e41591595eab.tar.gz
chromium_src-7bee1e113242a39b41579e07cd83e41591595eab.tar.bz2
WebKit merge 39100:39141 (CL 2 of 2).
Review URL: http://codereview.chromium.org/14040 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6881 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 557e518..85f9889 100644
--- a/DEPS
+++ b/DEPS
@@ -12,7 +12,7 @@ deps = {
"http://googletest.googlecode.com/svn/trunk@63",
"src/third_party/WebKit":
- "/trunk/deps/third_party/WebKit@6803",
+ "/trunk/deps/third_party/WebKit@6880",
"src/third_party/icu38":
"/trunk/deps/third_party/icu38@6780",
@@ -21,13 +21,13 @@ deps = {
"http://v8.googlecode.com/svn/trunk@968",
"src/webkit/data/layout_tests/LayoutTests":
- "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@39100",
+ "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@39141",
"src/third_party/WebKit/WebKit":
- "http://svn.webkit.org/repository/webkit/trunk/WebKit@39100",
+ "http://svn.webkit.org/repository/webkit/trunk/WebKit@39141",
"src/third_party/WebKit/WebKitLibraries":
- "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@39100",
+ "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@39141",
}