diff options
| author | playmobil@google.com <playmobil@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-31 18:15:45 +0000 |
|---|---|---|
| committer | playmobil@google.com <playmobil@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-31 18:15:45 +0000 |
| commit | 27a09bc3738310cc791335f37ab1bf1fc43dec5b (patch) | |
| tree | 49c52d8cf6b789439736006a1ba2deb388fcd957 | |
| parent | 4f999134a2e270792abc8b5ac6ad70aa500dcef4 (diff) | |
| download | chromium_src-27a09bc3738310cc791335f37ab1bf1fc43dec5b.zip chromium_src-27a09bc3738310cc791335f37ab1bf1fc43dec5b.tar.gz chromium_src-27a09bc3738310cc791335f37ab1bf1fc43dec5b.tar.bz2 | |
Chrome side of WebKit merge 42116:42132
Review URL: http://codereview.chromium.org/56116
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12883 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": "42115", + "webkit_revision": "42132", } @@ -19,7 +19,7 @@ deps = { "http://googletest.googlecode.com/svn/trunk@214", "src/third_party/WebKit": - "/trunk/deps/third_party/WebKit@12875", + "/trunk/deps/third_party/WebKit@12882", "src/third_party/icu38": "/trunk/deps/third_party/icu38@12390", diff --git a/WEBKIT_MERGE_REVISION b/WEBKIT_MERGE_REVISION index 2231f1a..ea78c4b 100644 --- a/WEBKIT_MERGE_REVISION +++ b/WEBKIT_MERGE_REVISION @@ -1 +1 @@ -http://svn.webkit.org/repository/webkit/trunk@42115
\ No newline at end of file +http://svn.webkit.org/repository/webkit/trunk@42132
\ No newline at end of file |