summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-16 01:05:17 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-16 01:05:17 +0000
commit31a1a0db643f2c9323cecfdf4ae911e4434faca0 (patch)
tree2434a3e48b34921769dc05e1558277a2243dfc41
parent96edc51d2e3d1ca2ca632e829795821e52fbb00d (diff)
downloadchromium_src-31a1a0db643f2c9323cecfdf4ae911e4434faca0.zip
chromium_src-31a1a0db643f2c9323cecfdf4ae911e4434faca0.tar.gz
chromium_src-31a1a0db643f2c9323cecfdf4ae911e4434faca0.tar.bz2
Chrome side of WebKit merge 39933:39953
Review URL: http://codereview.chromium.org/18301 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8154 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS8
-rw-r--r--WEBKIT_MERGE_REVISION2
2 files changed, 5 insertions, 5 deletions
diff --git a/DEPS b/DEPS
index 3d985e7..540d8b0 100644
--- a/DEPS
+++ b/DEPS
@@ -12,7 +12,7 @@ deps = {
"http://googletest.googlecode.com/svn/trunk@167",
"src/third_party/WebKit":
- "/trunk/deps/third_party/WebKit@8120",
+ "/trunk/deps/third_party/WebKit@8151",
"src/third_party/icu38":
"/trunk/deps/third_party/icu38@7525",
@@ -21,13 +21,13 @@ deps = {
"http://v8.googlecode.com/svn/trunk@1040",
"src/webkit/data/layout_tests/LayoutTests":
- "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@39933",
+ "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@39953",
"src/third_party/WebKit/WebKit":
- "http://svn.webkit.org/repository/webkit/trunk/WebKit@39933",
+ "http://svn.webkit.org/repository/webkit/trunk/WebKit@39953",
"src/third_party/WebKit/WebKitLibraries":
- "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@39933",
+ "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@39953",
}
diff --git a/WEBKIT_MERGE_REVISION b/WEBKIT_MERGE_REVISION
index 389cf63..c792733 100644
--- a/WEBKIT_MERGE_REVISION
+++ b/WEBKIT_MERGE_REVISION
@@ -1 +1 @@
-http://svn.webkit.org/repository/webkit/trunk@39933 \ No newline at end of file
+http://svn.webkit.org/repository/webkit/trunk@39953 \ No newline at end of file