summaryrefslogtreecommitdiffstats
path: root/WEBKIT_MERGE_REVISION
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2010-06-16 15:03:22 +0100
committerBen Murdoch <benm@google.com>2010-06-18 14:37:05 +0100
commit88bdcf91d7935b1db93296a4fc716bc1436dc0ce (patch)
treea810b3157b0bd25674440a65875bb28f78fda9d7 /WEBKIT_MERGE_REVISION
parent0939fa36856168302a4558cf3cf2eb842dfe6c0a (diff)
downloadexternal_webkit-88bdcf91d7935b1db93296a4fc716bc1436dc0ce.zip
external_webkit-88bdcf91d7935b1db93296a4fc716bc1436dc0ce.tar.gz
external_webkit-88bdcf91d7935b1db93296a4fc716bc1436dc0ce.tar.bz2
Merge webkit.org at r61121: Update WebKit revision number.
Change-Id: Ie4beb3ae65c015eb6116357326e38759476bad3c
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 a5c28c2..a7a1e2a 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.423.0/DEPS -> http://src.chromium.org/svn/trunk/src/DEPS@48687
-http://svn.webkit.org/repository/webkit/trunk@60469
+http://src.chromium.org/svn/releases/6.0.436.0/DEPS
+http://svn.webkit.org/repository/webkit/trunk@61121