summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2010-09-21 18:59:18 +0100
committerSteve Block <steveblock@google.com>2010-09-29 18:32:25 +0100
commitec57b3b518584fcf031d2a5215cc564c54866149 (patch)
tree3fdaa6eb1c572f6a7589fefe0619b4c92a521a05
parenta0e12fbb7d3eec607b7988fb8ff873305583acc4 (diff)
downloadexternal_webkit-ec57b3b518584fcf031d2a5215cc564c54866149.zip
external_webkit-ec57b3b518584fcf031d2a5215cc564c54866149.tar.gz
external_webkit-ec57b3b518584fcf031d2a5215cc564c54866149.tar.bz2
Merge WebKit at r67908: Update WebKit merge revision
Change-Id: Iba3c15bea94293909b64145f5f2d67eab240d2d4
-rw-r--r--ThirdPartyProject.prop4
1 files changed, 2 insertions, 2 deletions
diff --git a/ThirdPartyProject.prop b/ThirdPartyProject.prop
index 24b0f9b..b0ca51e 100644
--- a/ThirdPartyProject.prop
+++ b/ThirdPartyProject.prop
@@ -1,11 +1,11 @@
# Copyright 2010 Google Inc. All Rights Reserved.
#Fri Sep 10 11:49:27 BST 2010
currentVersion=55486
-version=67178
+version=67908
isNative=true
name=webkit
keywords=webkit
onDevice=true
homepage=http\://webkit.org/
# We use a WebKit revision that has been used for a Chromium release.
-webkit.chromiumRelease=http\://src.chromium.org/svn/releases/7.0.522.0/DEPS
+webkit.chromiumRelease=http\://src.chromium.org/svn/releases/7.0.530.0/DEPS