From 3bb4537e689db69c7b25d72ab6d6222616502dac Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Thu, 17 May 2012 16:35:32 +0100 Subject: Add WEBKIT_MERGE_REVISION Now that ThirdPartyProject.prop was removed, revert to the old way of tracking our webkit merge revision. See I5384206c478da146a7fbd5333bfb3227d9c042e4 for removal. Change-Id: I8a8eb4797158e6d18e50bf65f3bd0c9b5c79835c --- WEBKIT_MERGE_REVISION | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 WEBKIT_MERGE_REVISION (limited to 'WEBKIT_MERGE_REVISION') diff --git a/WEBKIT_MERGE_REVISION b/WEBKIT_MERGE_REVISION new file mode 100644 index 0000000..956ae85 --- /dev/null +++ b/WEBKIT_MERGE_REVISION @@ -0,0 +1,5 @@ +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. + +See also http://src.chromium.org/svn/releases/12.0.742.130/DEPS -- cgit v1.1