summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2010-04-25 23:39:10 -0700
committerSteve Block <steveblock@google.com>2010-05-11 14:42:15 +0100
commitcae38efe66aa87d4dbcc096e0d59574e6f7122d7 (patch)
tree0d630e8cb704da1458f3d3425b1e68f8fd246f59
parent84e0d487700601ecf57ecabd3222f640728cf302 (diff)
downloadexternal_webkit-cae38efe66aa87d4dbcc096e0d59574e6f7122d7.zip
external_webkit-cae38efe66aa87d4dbcc096e0d59574e6f7122d7.tar.gz
external_webkit-cae38efe66aa87d4dbcc096e0d59574e6f7122d7.tar.bz2
Merge webkit.org at r58033 : Update WebKit revision
Change-Id: I5c90103b547a4d4714adb4e128e76cb373259421
-rw-r--r--WEBKIT_MERGE_REVISION4
1 files changed, 2 insertions, 2 deletions
diff --git a/WEBKIT_MERGE_REVISION b/WEBKIT_MERGE_REVISION
index 17cb9bb..5734a95 100644
--- a/WEBKIT_MERGE_REVISION
+++ b/WEBKIT_MERGE_REVISION
@@ -1,4 +1,4 @@
We use a WebKit revision that has been used for a Chromium release.
-http://src.chromium.org/svn/releases/5.0.335.0/DEPS
-http://svn.webkit.org/repository/webkit/trunk@55033
+http://src.chromium.org/svn/releases/5.0.387.0/DEPS
+http://svn.webkit.org/repository/webkit/trunk@58033