diff options
| author | playmobil@google.com <playmobil@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-29 18:31:40 +0000 |
|---|---|---|
| committer | playmobil@google.com <playmobil@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-29 18:31:40 +0000 |
| commit | d9f5daca67369220f34029ecdd77e288d46c3596 (patch) | |
| tree | 6fddf4144202af9c5d7310b429e72fe34d0a78f5 | |
| parent | 59ab005e5b87347034d7fa09b1824f37eb77c4d5 (diff) | |
| download | chromium_src-d9f5daca67369220f34029ecdd77e288d46c3596.zip chromium_src-d9f5daca67369220f34029ecdd77e288d46c3596.tar.gz chromium_src-d9f5daca67369220f34029ecdd77e288d46c3596.tar.bz2 | |
Chrome side of WebKit Merge 42932:42994
Review URL: http://codereview.chromium.org/99193
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14861 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 4 | ||||
| -rw-r--r-- | WEBKIT_MERGE_REVISION | 2 |
2 files changed, 3 insertions, 3 deletions
@@ -1,7 +1,7 @@ vars = { "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", - "webkit_revision": "42932", + "webkit_revision": "42995", } @@ -19,7 +19,7 @@ deps = { "http://googletest.googlecode.com/svn/trunk@214", "src/third_party/WebKit": - "/trunk/deps/third_party/WebKit@14775", + "/trunk/deps/third_party/WebKit@14860", "src/third_party/icu38": "/trunk/deps/third_party/icu38@13472", diff --git a/WEBKIT_MERGE_REVISION b/WEBKIT_MERGE_REVISION index bc96b47..312b2b2 100644 --- a/WEBKIT_MERGE_REVISION +++ b/WEBKIT_MERGE_REVISION @@ -1 +1 @@ -http://svn.webkit.org/repository/webkit/trunk@42932
\ No newline at end of file +http://svn.webkit.org/repository/webkit/trunk@42995
\ No newline at end of file |