diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-14 22:43:38 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-14 22:43:38 +0000 |
| commit | 4ef2170bc994581f69c50f6330de57b9e7cbc619 (patch) | |
| tree | d9330763e668617c21e2113b7ade69d956bbb25d /DEPS | |
| parent | a3e2bc4122a33a9e71045986e2aebfb89c2a405c (diff) | |
| download | chromium_src-4ef2170bc994581f69c50f6330de57b9e7cbc619.zip chromium_src-4ef2170bc994581f69c50f6330de57b9e7cbc619.tar.gz chromium_src-4ef2170bc994581f69c50f6330de57b9e7cbc619.tar.bz2 | |
Chromium part of WebKit merge 39880:39894
This also adds a batch file for running the merge script since I don't have sh.
Review URL: http://codereview.chromium.org/18061
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8044 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'DEPS')
| -rw-r--r-- | DEPS | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -12,7 +12,7 @@ deps = { "http://googletest.googlecode.com/svn/trunk@167", "src/third_party/WebKit": - "/trunk/deps/third_party/WebKit@8024", + "/trunk/deps/third_party/WebKit@8041", "src/third_party/icu38": "/trunk/deps/third_party/icu38@7525", @@ -21,13 +21,13 @@ deps = { "http://v8.googlecode.com/svn/trunk@1040", "src/webkit/data/layout_tests/LayoutTests": - "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@39880", + "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@39894", "src/third_party/WebKit/WebKit": - "http://svn.webkit.org/repository/webkit/trunk/WebKit@39880", + "http://svn.webkit.org/repository/webkit/trunk/WebKit@39894", "src/third_party/WebKit/WebKitLibraries": - "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@39880", + "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@39894", } |