summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2011-05-17 17:51:44 +0100
committerBen Murdoch <benm@google.com>2011-05-23 18:54:18 +0100
commit10b539940b83c9b7ea6a6ebcf8707d9841b4284f (patch)
treec59cf51713f98fe8db8b538be419b38854641bc5
parent53733164eb6cabab5a1eddcabb42e4ce27eb0e44 (diff)
downloadexternal_webkit-10b539940b83c9b7ea6a6ebcf8707d9841b4284f.zip
external_webkit-10b539940b83c9b7ea6a6ebcf8707d9841b4284f.tar.gz
external_webkit-10b539940b83c9b7ea6a6ebcf8707d9841b4284f.tar.bz2
Merge WebKit at r76408: Update ThirdPartyProject.prop
Update merge revisions. Change-Id: I1ffb3ef0f49409fd2a815c1eb06de57889a83820
-rw-r--r--ThirdPartyProject.prop4
1 files changed, 2 insertions, 2 deletions
diff --git a/ThirdPartyProject.prop b/ThirdPartyProject.prop
index 18d3390..5b153a1 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=75993
+version=76408
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/10.0.642.2/DEPS
+webkit.chromiumRelease=http\://src.chromium.org/svn/releases/10.0.648.0/DEPS