summaryrefslogtreecommitdiffstats
path: root/DEPS
diff options
context:
space:
mode:
authordglazkov@google.com <dglazkov@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-12 18:13:58 +0000
committerdglazkov@google.com <dglazkov@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-12 18:13:58 +0000
commit53b00c098dde5956d9627bc6f184c3a62e10650f (patch)
tree405dffc2254b5a310d41df8ece4e572f208fc781 /DEPS
parentffaf78a76172755b47a12c408656818d05232b85 (diff)
downloadchromium_src-53b00c098dde5956d9627bc6f184c3a62e10650f.zip
chromium_src-53b00c098dde5956d9627bc6f184c3a62e10650f.tar.gz
chromium_src-53b00c098dde5956d9627bc6f184c3a62e10650f.tar.bz2
Landing 38097:38305 merge (src/webkit, DEPS)
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5265 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'DEPS')
-rw-r--r--DEPS4
1 files changed, 2 insertions, 2 deletions
diff --git a/DEPS b/DEPS
index 7c12a49..ae687a1 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@5220",
+ "/trunk/deps/third_party/WebKit@5264",
"src/third_party/icu38":
"/trunk/deps/third_party/icu38@5179",
@@ -21,7 +21,7 @@ deps = {
"http://v8.googlecode.com/svn/trunk@696",
"src/webkit/data/layout_tests/LayoutTests":
- "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@37604",
+ "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@38305",
}