summaryrefslogtreecommitdiffstats
path: root/WEBKIT_MERGE_REVISION
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2010-05-26 11:30:57 +0100
committerSteve Block <steveblock@google.com>2010-05-27 11:16:17 +0100
commit6c67d2432fd6eddf638e4d50f7de5ae791ed22b6 (patch)
tree4b9ea96e1881e61639560d1316628e21aff50162 /WEBKIT_MERGE_REVISION
parentf2cb3699566c53396dabf80b6a64e7daadedddd2 (diff)
downloadexternal_webkit-6c67d2432fd6eddf638e4d50f7de5ae791ed22b6.zip
external_webkit-6c67d2432fd6eddf638e4d50f7de5ae791ed22b6.tar.gz
external_webkit-6c67d2432fd6eddf638e4d50f7de5ae791ed22b6.tar.bz2
Merge WebKit at r60074: Update WEBKIT_MERGE_REVISION
Change-Id: I0d3f2bcfe262888ca1388b56c680d13e3b1f455c
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 afacfed..393a1d7 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/6.0.408.2/DEPS
-http://svn.webkit.org/repository/webkit/trunk@59636
+http://src.chromium.org/svn/releases/6.0.415.0/DEPS -> http://src.chromium.org/svn/trunk/src/DEPS@48014
+http://svn.webkit.org/repository/webkit/trunk@60074