summaryrefslogtreecommitdiffstats
path: root/DEPS
diff options
context:
space:
mode:
authorojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-22 00:32:42 +0000
committerojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-22 00:32:42 +0000
commit84dee7fa8a7098e54f1dd12a028bc1ea9a76c99b (patch)
tree0c23acf1a8489a94f164b1c0a4e113317e905a61 /DEPS
parent65383e62cd5f143c96c6fbd458817c9eb1854c9c (diff)
downloadchromium_src-84dee7fa8a7098e54f1dd12a028bc1ea9a76c99b.zip
chromium_src-84dee7fa8a7098e54f1dd12a028bc1ea9a76c99b.tar.gz
chromium_src-84dee7fa8a7098e54f1dd12a028bc1ea9a76c99b.tar.bz2
Update deps and the merge tool now that WebKit and WebKitLibraries have been deleted.
Review URL: http://codereview.chromium.org/11370 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5878 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'DEPS')
-rw-r--r--DEPS8
1 files changed, 7 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index b0d247d..a3829ea 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@5865",
+ "/trunk/deps/third_party/WebKit@5870",
"src/third_party/icu38":
"/trunk/deps/third_party/icu38@5749",
@@ -22,6 +22,12 @@ deps = {
"src/webkit/data/layout_tests/LayoutTests":
"http://svn.webkit.org/repository/webkit/trunk/LayoutTests@38575",
+
+ "src/third_party/WebKit/WebKit":
+ "http://svn.webkit.org/repository/webkit/trunk/WebKit@38575",
+
+ "src/third_party/WebKit/WebKitLibraries":
+ "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@38575",
}