diff options
author | Ben Murdoch <benm@google.com> | 2012-05-17 16:35:32 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2012-05-17 16:57:24 +0100 |
commit | 3bb4537e689db69c7b25d72ab6d6222616502dac (patch) | |
tree | ec614e837b4879074d145574295dd48c0e889494 /WEBKIT_MERGE_REVISION | |
parent | adbd1773b0a309d0374d20ab16b714e2d1c2e4df (diff) | |
download | external_webkit-3bb4537e689db69c7b25d72ab6d6222616502dac.zip external_webkit-3bb4537e689db69c7b25d72ab6d6222616502dac.tar.gz external_webkit-3bb4537e689db69c7b25d72ab6d6222616502dac.tar.bz2 |
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
Diffstat (limited to 'WEBKIT_MERGE_REVISION')
-rw-r--r-- | WEBKIT_MERGE_REVISION | 5 |
1 files changed, 5 insertions, 0 deletions
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 |