summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKristian Monsen <kristianm@google.com>2010-07-08 03:49:34 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-07-08 03:49:34 -0700
commit95a67313522ac17282f27adccd0149832b2bdad5 (patch)
tree06c8c625d74893742efeb352a7cdf9dd678b693a
parent9cb7f5358918382737032312d45d4b2a89136d76 (diff)
parent89ddeb2e6c658ec1409eaddd9710fbb4e897e536 (diff)
downloadexternal_webkit-95a67313522ac17282f27adccd0149832b2bdad5.zip
external_webkit-95a67313522ac17282f27adccd0149832b2bdad5.tar.gz
external_webkit-95a67313522ac17282f27adccd0149832b2bdad5.tar.bz2
Merge "Merge WebKit at r61871: Update 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 a7a1e2a..a9b7802 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.436.0/DEPS
-http://svn.webkit.org/repository/webkit/trunk@61121
+http://src.chromium.org/svn/releases/6.0.450.0/DEPS
+http://svn.webkit.org/repository/webkit/trunk@61871