summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-11 21:04:19 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-11 21:04:19 +0000
commitd5f3d4fbdd1f22a92dc9ac993f06231129124a26 (patch)
treef801a46327232ea2e95eadb14515046e45ca6e88
parent7e7b09d451ca51d07148602efe93875ad90f320d (diff)
downloadchromium_src-d5f3d4fbdd1f22a92dc9ac993f06231129124a26.zip
chromium_src-d5f3d4fbdd1f22a92dc9ac993f06231129124a26.tar.gz
chromium_src-d5f3d4fbdd1f22a92dc9ac993f06231129124a26.tar.bz2
Chrome side of WebKit merge 41559:41588
Review URL: http://codereview.chromium.org/43084 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11483 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS4
-rw-r--r--WEBKIT_MERGE_REVISION2
2 files changed, 3 insertions, 3 deletions
diff --git a/DEPS b/DEPS
index 0b0e53e..1528c2c 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "41559",
+ "webkit_revision": "41588",
}
@@ -19,7 +19,7 @@ deps = {
"http://googletest.googlecode.com/svn/trunk@167",
"src/third_party/WebKit":
- "/trunk/deps/third_party/WebKit@11399",
+ "/trunk/deps/third_party/WebKit@11475",
"src/third_party/icu38":
"/trunk/deps/third_party/icu38@11389",
diff --git a/WEBKIT_MERGE_REVISION b/WEBKIT_MERGE_REVISION
index c7d3fef..29394c7 100644
--- a/WEBKIT_MERGE_REVISION
+++ b/WEBKIT_MERGE_REVISION
@@ -1 +1 @@
-http://svn.webkit.org/repository/webkit/trunk@41559 \ No newline at end of file
+http://svn.webkit.org/repository/webkit/trunk@41588 \ No newline at end of file