summaryrefslogtreecommitdiffstats
path: root/DEPS
diff options
context:
space:
mode:
authorpamg@google.com <pamg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-19 00:17:19 +0000
committerpamg@google.com <pamg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-19 00:17:19 +0000
commit349f6911964be4226312f970d038bdfc3339face (patch)
tree1158ebe25a41ee9ca74c918300ec2e946c9411bd /DEPS
parent5d846d975e6febb772269fabb22ddde52842a1c5 (diff)
downloadchromium_src-349f6911964be4226312f970d038bdfc3339face.zip
chromium_src-349f6911964be4226312f970d038bdfc3339face.tar.gz
chromium_src-349f6911964be4226312f970d038bdfc3339face.tar.bz2
Chromium half of the WebKit merge from 39335 to 39369.
Review URL: http://codereview.chromium.org/15404 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7279 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 9c8029c..c49c555 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@7261",
+ "/trunk/deps/third_party/WebKit@7278",
"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@39335",
+ "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@39369",
"src/third_party/WebKit/WebKit":
- "http://svn.webkit.org/repository/webkit/trunk/WebKit@39335",
+ "http://svn.webkit.org/repository/webkit/trunk/WebKit@39369",
"src/third_party/WebKit/WebKitLibraries":
- "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@39335",
+ "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@39369",
}