diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-11 18:18:57 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-11 18:18:57 +0000 |
| commit | 12117f3379caccd1e75cbee72f94667073b14d18 (patch) | |
| tree | 14147964470bdecf2c9e6a7db723979367efdcb1 /DEPS | |
| parent | 8433ee6f49957eb6fc171a6f8a4277b8b801cef8 (diff) | |
| download | chromium_src-12117f3379caccd1e75cbee72f94667073b14d18.zip chromium_src-12117f3379caccd1e75cbee72f94667073b14d18.tar.gz chromium_src-12117f3379caccd1e75cbee72f94667073b14d18.tar.bz2 | |
Re-apply the webkit merge. This is a revert of 11454 and 11455.
TBR=jar
Review URL: http://codereview.chromium.org/42080
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11457 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'DEPS')
| -rw-r--r-- | DEPS | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,7 +1,7 @@ vars = { "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", - "webkit_revision": "41530", + "webkit_revision": "41559", } @@ -19,7 +19,7 @@ deps = { "http://googletest.googlecode.com/svn/trunk@167", "src/third_party/WebKit": - "/trunk/deps/third_party/WebKit@11353", + "/trunk/deps/third_party/WebKit@11399", "src/third_party/icu38": "/trunk/deps/third_party/icu38@11389", |