summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2009-11-05 18:44:14 +0000
committerSteve Block <steveblock@google.com>2009-11-10 22:41:15 +0000
commit70c8e1be70c9509280aa52daa293153cb033df13 (patch)
treed2c37e309036ad2bff759953c67f1c106ff045b7
parent20626c197f988d4bae39e99e4699173602b0aaaa (diff)
downloadexternal_webkit-70c8e1be70c9509280aa52daa293153cb033df13.zip
external_webkit-70c8e1be70c9509280aa52daa293153cb033df13.tar.gz
external_webkit-70c8e1be70c9509280aa52daa293153cb033df13.tar.bz2
Merge webkit.org at r50258 : Update WebKit revision number.
Change-Id: If63324be97f04e715aa12b278a1c46d8845690f4
-rw-r--r--WEBKIT_MERGE_REVISION4
1 files changed, 2 insertions, 2 deletions
diff --git a/WEBKIT_MERGE_REVISION b/WEBKIT_MERGE_REVISION
index 8eb12d6..abb1685 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.
-http://src.chromium.org/svn/branches/187/src@18043
-http://svn.webkit.org/repository/webkit/trunk@49305
+http://src.chromium.org/svn/branches/229/src/DEPS@30923
+http://svn.webkit.org/repository/webkit/trunk@50258