diff options
author | Steve Block <steveblock@google.com> | 2010-09-07 21:47:51 +0100 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2010-09-07 21:57:53 +0100 |
commit | 1bc3da8082294f8803b6faaa8126165aa398efb9 (patch) | |
tree | b1cc08d56b37e401509066b479d635c4345ed9ef | |
parent | eff69b907ef2cd3a9af0351287a929c66f58e3f6 (diff) | |
download | external_webkit-1bc3da8082294f8803b6faaa8126165aa398efb9.zip external_webkit-1bc3da8082294f8803b6faaa8126165aa398efb9.tar.gz external_webkit-1bc3da8082294f8803b6faaa8126165aa398efb9.tar.bz2 |
Remove WEBKIT_MERGE_REVISION in favour of ThirdPartyProject.prop
Change-Id: Id7330a7535f9cf00557ad11627d40f2ad1ca9537
-rw-r--r-- | ThirdPartyProject.prop | 6 | ||||
-rw-r--r-- | WEBKIT_MERGE_REVISION | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/ThirdPartyProject.prop b/ThirdPartyProject.prop index 3984909..2999b17 100644 --- a/ThirdPartyProject.prop +++ b/ThirdPartyProject.prop @@ -1,9 +1,11 @@ # Copyright 2010 Google Inc. All Rights Reserved. -#Fri Jul 16 10:03:09 PDT 2010 +#Tue Sep 7 13:44:27 PDT 2010 currentVersion=55486 -version=54731 +version=66079 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/7.0.506.0/DEPS diff --git a/WEBKIT_MERGE_REVISION b/WEBKIT_MERGE_REVISION deleted file mode 100644 index 3bcc7a9..0000000 --- a/WEBKIT_MERGE_REVISION +++ /dev/null @@ -1,4 +0,0 @@ -We use a WebKit revision that has been used for a Chromium release. - -http://src.chromium.org/svn/releases/7.0.506.0/DEPS -http://svn.webkit.org/repository/webkit/trunk@66079 |