summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2010-02-02 18:47:35 +0000
committerSteve Block <steveblock@google.com>2010-02-04 22:48:44 +0000
commit14fdbbe4f8b7731af47530c11ed17e29234151b7 (patch)
treedc8b8c224e7e0ef78c5ee852ad7c9e7e120635cc
parentc38f6d0ecb29af3c5ff8e76fd65713121e3ba395 (diff)
downloadexternal_webkit-14fdbbe4f8b7731af47530c11ed17e29234151b7.zip
external_webkit-14fdbbe4f8b7731af47530c11ed17e29234151b7.tar.gz
external_webkit-14fdbbe4f8b7731af47530c11ed17e29234151b7.tar.bz2
Merge webkit.org at r54127 : Update WEBKIT_MERGE_REVISION
Change-Id: Ifb43cc186611cc8a9b89552132f85e4f46e182ee
-rw-r--r--WEBKIT_MERGE_REVISION6
1 files changed, 3 insertions, 3 deletions
diff --git a/WEBKIT_MERGE_REVISION b/WEBKIT_MERGE_REVISION
index bd0f254..0721430 100644
--- a/WEBKIT_MERGE_REVISION
+++ b/WEBKIT_MERGE_REVISION
@@ -1,4 +1,4 @@
-We sync with Chromium release revision, which has both webkit revision and V8 revision.
+We use a WebKit revision that has been used for a Chromium release.
-http://src.chromium.org/svn/releases/4.0.269.0/DEPS
-http://svn.webkit.org/repository/webkit/trunk@51976
+http://src.chromium.org/svn/releases/5.0.313.0/DEPS
+http://svn.webkit.org/repository/webkit/trunk@54127