summaryrefslogtreecommitdiffstats
path: root/WEBKIT_MERGE_REVISION
diff options
context:
space:
mode:
authorKristian Monsen <kristianm@google.com>2010-05-25 11:08:19 +0100
committerKristian Monsen <kristianm@google.com>2010-05-25 16:02:05 +0100
commit61f4e2b44e5fee639fb4e97b6d54acfa313925f7 (patch)
treebcaa26e02023a326942d1c3c0275bac8c7017c89 /WEBKIT_MERGE_REVISION
parent837f29126359f163a9f0698a3a6ddfdf6dd086c4 (diff)
downloadexternal_webkit-61f4e2b44e5fee639fb4e97b6d54acfa313925f7.zip
external_webkit-61f4e2b44e5fee639fb4e97b6d54acfa313925f7.tar.gz
external_webkit-61f4e2b44e5fee639fb4e97b6d54acfa313925f7.tar.bz2
Merge WebKit at r59636: Update WebKit version
Change-Id: I784830d55a5238da319e9487fd113d81b11b4735
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 66671d4..afacfed 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.399.0/DEPS
-http://svn.webkit.org/repository/webkit/trunk@58956
+http://src.chromium.org/svn/releases/6.0.408.2/DEPS
+http://svn.webkit.org/repository/webkit/trunk@59636