summaryrefslogtreecommitdiffstats
path: root/DEPS
diff options
context:
space:
mode:
authorbrettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-09 00:52:39 +0000
committerbrettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-09 00:52:39 +0000
commit8637e46c175c41c6cbc4bb9d99b58303372aa260 (patch)
treeb7f642928191ad5fa82868419113acc5c288af12 /DEPS
parentba225f6f5f230d0077496cb9b31a85a368fb41ad (diff)
downloadchromium_src-8637e46c175c41c6cbc4bb9d99b58303372aa260.zip
chromium_src-8637e46c175c41c6cbc4bb9d99b58303372aa260.tar.gz
chromium_src-8637e46c175c41c6cbc4bb9d99b58303372aa260.tar.bz2
Merge WebKit from r38950 -> r39000
Review URL: http://codereview.chromium.org/11017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6563 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 4fe699b..7ff8772 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@6479",
+ "/trunk/deps/third_party/WebKit@6544",
"src/third_party/icu38":
"/trunk/deps/third_party/icu38@5827",
@@ -21,13 +21,13 @@ deps = {
"http://v8.googlecode.com/svn/trunk@911",
"src/webkit/data/layout_tests/LayoutTests":
- "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@38950",
+ "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@39000",
"src/third_party/WebKit/WebKit":
- "http://svn.webkit.org/repository/webkit/trunk/WebKit@38950",
+ "http://svn.webkit.org/repository/webkit/trunk/WebKit@39000",
"src/third_party/WebKit/WebKitLibraries":
- "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@38950",
+ "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@39000",
}