summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeon Clarke <leonclarke@google.com>2010-06-04 11:15:15 +0100
committerLeon Clarke <leonclarke@google.com>2010-06-08 14:50:10 +0100
commit1c65de00d27cc78a09c3ec6f7d17ff3edad5a9c8 (patch)
treecb2cb3479458d4f74b9f0a220e4a59352eeed92e
parentb0e900ed67f9655e2cffe4a5a6839826e5c67421 (diff)
downloadexternal_webkit-1c65de00d27cc78a09c3ec6f7d17ff3edad5a9c8.zip
external_webkit-1c65de00d27cc78a09c3ec6f7d17ff3edad5a9c8.tar.gz
external_webkit-1c65de00d27cc78a09c3ec6f7d17ff3edad5a9c8.tar.bz2
Merge webkit.org at r60469 : Update WebKit revision
Change-Id: I2dd84902068301e0037b361d0191711bb57afbdd
-rw-r--r--WEBKIT_MERGE_REVISION4
1 files changed, 2 insertions, 2 deletions
diff --git a/WEBKIT_MERGE_REVISION b/WEBKIT_MERGE_REVISION
index 393a1d7..a5c28c2 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.415.0/DEPS -> http://src.chromium.org/svn/trunk/src/DEPS@48014
-http://svn.webkit.org/repository/webkit/trunk@60074
+http://src.chromium.org/svn/releases/6.0.423.0/DEPS -> http://src.chromium.org/svn/trunk/src/DEPS@48687
+http://svn.webkit.org/repository/webkit/trunk@60469