Merge "Put canvas on a layer" into ics-mr1

[android-x86/external-webkit.git] / ThirdPartyProject.prop

diff --git a/ThirdPartyProject.prop b/ThirdPartyProject.prop
index 11bdfb0..ae9d227 100644 (file)
--- a/ThirdPartyProject.prop
+++ b/ThirdPartyProject.prop
@@ -1,11 +1,13 @@
 # Copyright 2010 Google Inc. All Rights Reserved.
 #Fri Sep 10 11:49:27 BST 2010
 currentVersion=55486
-version=74534
+version=84325
 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.621.0/DEPS
+# Currently we track the Chromium 12.0.742 release branch:
+# http://trac.webkit.org/browser/branches/chromium/742
+# which is WebKit trunk r84325 plus stability cherry picks.
+webkit.chromiumRelease=http\://src.chromium.org/svn/releases/12.0.742.130/DEPS