summaryrefslogtreecommitdiffstats
path: root/DEPS
diff options
context:
space:
mode:
authorojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-16 21:04:58 +0000
committerojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-16 21:04:58 +0000
commitcb548eb8eeb5ea85ae2810a916b88fa8702e8ea0 (patch)
treeafb0d4c3e85d8c6077b9a6418b10ac02ffebdd19 /DEPS
parent3eece06ea813d3fd7d3e29fca307ee34e469d575 (diff)
downloadchromium_src-cb548eb8eeb5ea85ae2810a916b88fa8702e8ea0.zip
chromium_src-cb548eb8eeb5ea85ae2810a916b88fa8702e8ea0.tar.gz
chromium_src-cb548eb8eeb5ea85ae2810a916b88fa8702e8ea0.tar.bz2
webkit merge 39309:39335 part 2.
Review URL: http://codereview.chromium.org/14476 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7096 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 a701a00..7fc8241 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@7053",
+ "/trunk/deps/third_party/WebKit@7095",
"src/third_party/icu38":
"/trunk/deps/third_party/icu38@6780",
@@ -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@39309",
+ "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@39335",
"src/third_party/WebKit/WebKit":
- "http://svn.webkit.org/repository/webkit/trunk/WebKit@39309",
+ "http://svn.webkit.org/repository/webkit/trunk/WebKit@39335",
"src/third_party/WebKit/WebKitLibraries":
- "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@39309",
+ "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@39335",
}