summaryrefslogtreecommitdiffstats
path: root/WEBKIT_MERGE_REVISION
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2010-02-11 15:18:03 +0000
committerSteve Block <steveblock@google.com>2010-02-16 11:48:33 +0000
commit2e5a1e938add6ca3d39bb06da21fe73d7a33ac51 (patch)
treef0c185286ad1e32bbe864bfb63ad6c68511603d6 /WEBKIT_MERGE_REVISION
parent24ea027d1c0a2e695e2b788cdc12b3b4a0e0143a (diff)
downloadexternal_webkit-2e5a1e938add6ca3d39bb06da21fe73d7a33ac51.zip
external_webkit-2e5a1e938add6ca3d39bb06da21fe73d7a33ac51.tar.gz
external_webkit-2e5a1e938add6ca3d39bb06da21fe73d7a33ac51.tar.bz2
Merge webkit.org at r54731 : Update WEBKIT_MERGE_REVISION
Change-Id: I8c416f93989d0992f02b9c28590557caf8ba70ed
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 d3299d3..c4b8c03 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.318.0/DEPS
-http://svn.webkit.org/repository/webkit/trunk@54340
+http://src.chromium.org/svn/releases/5.0.328.0/DEPS
+http://svn.webkit.org/repository/webkit/trunk@54731