summaryrefslogtreecommitdiffstats
path: root/DEPS
diff options
context:
space:
mode:
authorojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-15 01:52:17 +0000
committerojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-15 01:52:17 +0000
commitdf4ac237348f1aebfe7ca345e2bc6375fd51a1dc (patch)
tree6ab434291b6208ada117d5f8059aebeadbe8aac5 /DEPS
parentf126fb9075674caa4df45c19ae8ded53cae1646f (diff)
downloadchromium_src-df4ac237348f1aebfe7ca345e2bc6375fd51a1dc.zip
chromium_src-df4ac237348f1aebfe7ca345e2bc6375fd51a1dc.tar.gz
chromium_src-df4ac237348f1aebfe7ca345e2bc6375fd51a1dc.tar.bz2
Pull in the webkit merge.
Review URL: http://codereview.chromium.org/10965 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5526 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 7de31f5..5abe35b 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@5468",
+ "/trunk/deps/third_party/WebKit@5522",
"src/third_party/icu38":
"/trunk/deps/third_party/icu38@5385",
@@ -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@38376",
+ "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@38389",
}