summaryrefslogtreecommitdiffstats
path: root/DEPS
diff options
context:
space:
mode:
authordarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-03 18:28:05 +0000
committerdarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-03 18:28:05 +0000
commitf6f8d8021f123ddb58ffa513e57cdffe9a769dd4 (patch)
tree7973c30f047f991e0db2ea3685c423d89e643b42 /DEPS
parent3f383853bdea91d3cf86d4214e4dfdee6a585805 (diff)
downloadchromium_src-f6f8d8021f123ddb58ffa513e57cdffe9a769dd4.zip
chromium_src-f6f8d8021f123ddb58ffa513e57cdffe9a769dd4.tar.gz
chromium_src-f6f8d8021f123ddb58ffa513e57cdffe9a769dd4.tar.bz2
WebKit merge 42132:42199 (Chrome side)
Account for a FrameLoader method that was renamed. R=amanda Review URL: http://codereview.chromium.org/62011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13095 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 89fa856..52aa303 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "42132",
+ "webkit_revision": "42199",
}
@@ -19,7 +19,7 @@ deps = {
"http://googletest.googlecode.com/svn/trunk@214",
"src/third_party/WebKit":
- "/trunk/deps/third_party/WebKit@12997",
+ "/trunk/deps/third_party/WebKit@13094",
"src/third_party/icu38":
"/trunk/deps/third_party/icu38@13083",