summaryrefslogtreecommitdiffstats
path: root/DEPS
diff options
context:
space:
mode:
authordarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-06 21:21:29 +0000
committerdarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-06 21:21:29 +0000
commitbc7d32ae2f283be26dd9b5b81d9fa53b39ec5aad (patch)
treefb964f9ca3fa0b6f3ef34361d12b071ef0ffcebd /DEPS
parent71ed35fc7ef44f4279a2a65db0e638cc2cc440b9 (diff)
downloadchromium_src-bc7d32ae2f283be26dd9b5b81d9fa53b39ec5aad.zip
chromium_src-bc7d32ae2f283be26dd9b5b81d9fa53b39ec5aad.tar.gz
chromium_src-bc7d32ae2f283be26dd9b5b81d9fa53b39ec5aad.tar.bz2
Chrome-side of WebKit merge 43242:43321
The v8_proxy.h change was authored by asargent and already reviewed here: http://codereview.chromium.org/79059 R=dglazkov Review URL: http://codereview.chromium.org/113056 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15460 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'DEPS')
-rw-r--r--DEPS4
1 files changed, 2 insertions, 2 deletions
diff --git a/DEPS b/DEPS
index 515f67e..f95c7bf 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "43242",
+ "webkit_revision": "43321",
}
@@ -19,7 +19,7 @@ deps = {
"http://googletest.googlecode.com/svn/trunk@243",
"src/third_party/WebKit":
- "/trunk/deps/third_party/WebKit@15383",
+ "/trunk/deps/third_party/WebKit@15459",
"src/third_party/icu38":
"/trunk/deps/third_party/icu38@13472",