summaryrefslogtreecommitdiffstats
path: root/WEBKIT_MERGE_REVISION
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2010-02-05 15:36:34 +0000
committerSteve Block <steveblock@google.com>2010-02-15 10:54:07 +0000
commita2a9aa200297099883000973aa8416f6407a9f85 (patch)
tree3eb210ce949eef0025bd5723245f4469d3654c5c /WEBKIT_MERGE_REVISION
parenta68f6ad78e1276adba0633974883ef40f9893334 (diff)
downloadexternal_webkit-a2a9aa200297099883000973aa8416f6407a9f85.zip
external_webkit-a2a9aa200297099883000973aa8416f6407a9f85.tar.gz
external_webkit-a2a9aa200297099883000973aa8416f6407a9f85.tar.bz2
Merge webkit.org at r54340 : Update WEBKIT_MERGE_REVISION
Change-Id: I267e0288b20fc62d4c300d0f9cb4fb0120d84174
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 0721430..d3299d3 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.313.0/DEPS
-http://svn.webkit.org/repository/webkit/trunk@54127
+http://src.chromium.org/svn/releases/5.0.318.0/DEPS
+http://svn.webkit.org/repository/webkit/trunk@54340