diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-09 17:51:39 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-09 17:51:39 +0000 |
| commit | 0e9020e23d636a40d32e83ce306468683ed03b01 (patch) | |
| tree | 281326ea1f3f9a9f99b138adbdd43906eacfc815 | |
| parent | 109ca1cf9b29865a0f99dc99f379784dc980ac46 (diff) | |
| download | chromium_src-0e9020e23d636a40d32e83ce306468683ed03b01.zip chromium_src-0e9020e23d636a40d32e83ce306468683ed03b01.tar.gz chromium_src-0e9020e23d636a40d32e83ce306468683ed03b01.tar.bz2 | |
Chrome side of WebKit merge 42287:42324.
Review URL: http://codereview.chromium.org/62161
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13436 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": "42287", + "webkit_revision": "42324", } @@ -19,7 +19,7 @@ deps = { "http://googletest.googlecode.com/svn/trunk@214", "src/third_party/WebKit": - "/trunk/deps/third_party/WebKit@13365", + "/trunk/deps/third_party/WebKit@13377", "src/third_party/icu38": "/trunk/deps/third_party/icu38@13083", diff --git a/WEBKIT_MERGE_REVISION b/WEBKIT_MERGE_REVISION index f077115..0cbbd95 100644 --- a/WEBKIT_MERGE_REVISION +++ b/WEBKIT_MERGE_REVISION @@ -1 +1 @@ -http://svn.webkit.org/repository/webkit/trunk@42287
\ No newline at end of file +http://svn.webkit.org/repository/webkit/trunk@42324
\ No newline at end of file |