summaryrefslogtreecommitdiffstats
path: root/WEBKIT_MERGE_REVISION
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2010-05-12 14:18:52 +0100
committerBen Murdoch <benm@google.com>2010-05-14 13:33:43 +0100
commit6d40f2e6b1331607174294710f67aee294385ed9 (patch)
tree00086321f7a2c7e606c8d6fb96e12e321a354c04 /WEBKIT_MERGE_REVISION
parent68fbf51eb6215d0666d9fe961f9eed3d5bc275d9 (diff)
downloadexternal_webkit-6d40f2e6b1331607174294710f67aee294385ed9.zip
external_webkit-6d40f2e6b1331607174294710f67aee294385ed9.tar.gz
external_webkit-6d40f2e6b1331607174294710f67aee294385ed9.tar.bz2
Merge Webkit at r58956: Update WebKit revision number.
Change-Id: Ic2e7908a14f735ac9b0b995f032015e8eb216edf
Diffstat (limited to 'WEBKIT_MERGE_REVISION')
-rw-r--r--WEBKIT_MERGE_REVISION4
1 files changed, 2 insertions, 2 deletions
diff --git a/WEBKIT_MERGE_REVISION b/WEBKIT_MERGE_REVISION
index 5734a95..66671d4 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.387.0/DEPS
-http://svn.webkit.org/repository/webkit/trunk@58033
+http://src.chromium.org/svn/releases/6.0.399.0/DEPS
+http://svn.webkit.org/repository/webkit/trunk@58956