summaryrefslogtreecommitdiffstats
path: root/DEPS
diff options
context:
space:
mode:
authortc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-24 00:27:23 +0000
committertc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-24 00:27:23 +0000
commitf460ef7d1e7e9421be4e7f868b2629fc64060ade (patch)
treefb86d8ea685f04a2bd84307a17bba172a2e07f1f /DEPS
parent0a93350fc146cd0ecf360b704f4934817e9c6be0 (diff)
downloadchromium_src-f460ef7d1e7e9421be4e7f868b2629fc64060ade.zip
chromium_src-f460ef7d1e7e9421be4e7f868b2629fc64060ade.tar.gz
chromium_src-f460ef7d1e7e9421be4e7f868b2629fc64060ade.tar.bz2
Chrome side of webkit merge to r40164.
One file added between r40124 and r40164, however, all the worker files didn't seem to be in the xcode project so I added all of them. Review URL: http://codereview.chromium.org/18733 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8601 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 be8897b..9179a73a 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@8538",
+ "/trunk/deps/third_party/WebKit@8597",
"src/third_party/icu38":
"/trunk/deps/third_party/icu38@7525",
@@ -21,13 +21,13 @@ deps = {
"http://v8.googlecode.com/svn/trunk@1103",
"src/webkit/data/layout_tests/LayoutTests":
- "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@40124",
+ "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@40164",
"src/third_party/WebKit/WebKit":
- "http://svn.webkit.org/repository/webkit/trunk/WebKit@40124",
+ "http://svn.webkit.org/repository/webkit/trunk/WebKit@40164",
"src/third_party/WebKit/WebKitLibraries":
- "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@40124",
+ "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@40164",
}