summaryrefslogtreecommitdiffstats
path: root/DEPS
diff options
context:
space:
mode:
authorpamg@google.com <pamg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-31 01:31:13 +0000
committerpamg@google.com <pamg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-31 01:31:13 +0000
commitb424cbe84ac347bfc6b673c92e9fd2f496cf963c (patch)
tree703cec99c602acab668765eefb40fcb5e348b82a /DEPS
parent9bcbbde0d74ac54e4da6b327d2269c2aaba520e4 (diff)
downloadchromium_src-b424cbe84ac347bfc6b673c92e9fd2f496cf963c.zip
chromium_src-b424cbe84ac347bfc6b673c92e9fd2f496cf963c.tar.gz
chromium_src-b424cbe84ac347bfc6b673c92e9fd2f496cf963c.tar.bz2
Chromium piece of merge 39501:39520.
BUG=none TEST=covered by layout tests Review URL: http://codereview.chromium.org/17035 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7523 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 6d7dda2..0c408b5 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@7518",
+ "/trunk/deps/third_party/WebKit@7522",
"src/third_party/icu38":
"/trunk/deps/third_party/icu38@7478",
@@ -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@39501",
+ "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@39520",
"src/third_party/WebKit/WebKit":
- "http://svn.webkit.org/repository/webkit/trunk/WebKit@39501",
+ "http://svn.webkit.org/repository/webkit/trunk/WebKit@39520",
"src/third_party/WebKit/WebKitLibraries":
- "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@39501",
+ "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@39520",
}