summaryrefslogtreecommitdiffstats
path: root/WEBKIT_MERGE_REVISION
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2010-04-25 21:33:40 -0700
committerSteve Block <steveblock@google.com>2010-04-27 17:09:15 +0100
commitec79cd2f7baa7ba941c8343f6d79f0dbfdd5be2a (patch)
tree65f4d85a10550f44d55aa51a840a5bb16c3ee142 /WEBKIT_MERGE_REVISION
parent3ff18e91319b06245b45f7b66cdb8ba9bb3b8859 (diff)
downloadexternal_webkit-ec79cd2f7baa7ba941c8343f6d79f0dbfdd5be2a.zip
external_webkit-ec79cd2f7baa7ba941c8343f6d79f0dbfdd5be2a.tar.gz
external_webkit-ec79cd2f7baa7ba941c8343f6d79f0dbfdd5be2a.tar.bz2
Merge webkit.org at r55033 : Update WebKit revision
Change-Id: Ie9ba4c69af684735ef4e884c75457738f33f0a3f
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 c4b8c03..17cb9bb 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.328.0/DEPS
-http://svn.webkit.org/repository/webkit/trunk@54731
+http://src.chromium.org/svn/releases/5.0.335.0/DEPS
+http://svn.webkit.org/repository/webkit/trunk@55033