summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorawalker@google.com <awalker@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-01 19:29:58 +0000
committerawalker@google.com <awalker@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-01 19:29:58 +0000
commita6cec6961699bd25051ca9e6f1e72ebb9c188638 (patch)
tree72eab68a1022b3b7b3d9ef9be7a3915796c83621
parente9700908ca95dcac6d48f0a695bd17494053a69a (diff)
downloadchromium_src-a6cec6961699bd25051ca9e6f1e72ebb9c188638.zip
chromium_src-a6cec6961699bd25051ca9e6f1e72ebb9c188638.tar.gz
chromium_src-a6cec6961699bd25051ca9e6f1e72ebb9c188638.tar.bz2
Chromium side of merge 43059:43114
Review URL: http://codereview.chromium.org/99290 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15080 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--WEBKIT_MERGE_REVISION2
2 files changed, 2 insertions, 2 deletions
diff --git a/DEPS b/DEPS
index 3cec856..b360181 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "43059",
+ "webkit_revision": "43114",
}
diff --git a/WEBKIT_MERGE_REVISION b/WEBKIT_MERGE_REVISION
index 3be549f..c98779c 100644
--- a/WEBKIT_MERGE_REVISION
+++ b/WEBKIT_MERGE_REVISION
@@ -1 +1 @@
-http://svn.webkit.org/repository/webkit/trunk@43059 \ No newline at end of file
+http://svn.webkit.org/repository/webkit/trunk@43114 \ No newline at end of file