diff options
| author | Steve Block <steveblock@google.com> | 2011-06-10 17:07:33 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-06-14 01:14:03 +0100 |
| commit | b3b0a11cfa8f7ee842f7b8c57a12326036312eb8 (patch) | |
| tree | 4be756ea30f5205ce107a389b769bee7a26ae967 | |
| parent | ee694a26d2441be3e10fa2d66232ec3d3a07f5c7 (diff) | |
| download | external_webkit-b3b0a11cfa8f7ee842f7b8c57a12326036312eb8.zip external_webkit-b3b0a11cfa8f7ee842f7b8c57a12326036312eb8.tar.gz external_webkit-b3b0a11cfa8f7ee842f7b8c57a12326036312eb8.tar.bz2 | |
Merge WebKit at branches/chromium/742 r88085: Update ThirdPartyProject.prop
Change-Id: Ic297de43b73b2ebce1d20053990f9d71bb54a16f
| -rw-r--r-- | ThirdPartyProject.prop | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ThirdPartyProject.prop b/ThirdPartyProject.prop index 03699fc..a228474 100644 --- a/ThirdPartyProject.prop +++ b/ThirdPartyProject.prop @@ -7,5 +7,7 @@ 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/12.0.742.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.93/DEPS |