diff options
| author | George Sherwood | 2010-07-23 06:00:23 -0500 |
|---|---|---|
| committer | George Sherwood | 2010-07-23 06:00:23 -0500 |
| commit | 09a835f47a22e46dbccb1023f06b5a4a310f29e2 (patch) | |
| tree | 38469f965a12234296855cd49e49debea88988d8 | |
| parent | 3323fa05e509360c230308562844104ce24be801 (diff) | |
xulrunner 1.9.2.7, FFVERSION=3.6.7, SECURITY_PATCH=15
(cherry picked from commit fe44b496a583c66d9716fa002af0330ea0e31445)
Conflicts:
http/xulrunner/DETAILS
http/xulrunner/HISTORY
| -rwxr-xr-x | http/xulrunner/DETAILS | 9 | ||||
| -rw-r--r-- | http/xulrunner/HISTORY | 4 |
2 files changed, 11 insertions, 2 deletions
diff --git a/http/xulrunner/DETAILS b/http/xulrunner/DETAILS index 61fc8c7a6d..da670ef138 100755 --- a/http/xulrunner/DETAILS +++ b/http/xulrunner/DETAILS @@ -1,6 +1,6 @@ SPELL=xulrunner - VERSION=1.9.2.6 - FFVERSION=3.6.6 + VERSION=1.9.2.7 + FFVERSION=3.6.7 SOURCE=firefox-$FFVERSION.source.tar.bz2 SOURCE2=$SOURCE.asc SOURCE2_IGNORE=signature @@ -9,7 +9,12 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION SOURCE_URL[0]=ftp://ftp.mozilla.org/pub/firefox/releases/$FFVERSION/source/$SOURCE SOURCE2_URL[0]=$SOURCE_URL.asc WEB_SITE=http://www.mozilla.org/ +<<<<<<< HEAD SECURITY_PATCH=14 +======= + SECURITY_PATCH=15 + PATCHLEVEL=0 +>>>>>>> fe44b49... xulrunner 1.9.2.7, FFVERSION=3.6.7, SECURITY_PATCH=15 ENTERED=20060829 LICENSE[0]=MPL DOCS="LICENSE README.txt" diff --git a/http/xulrunner/HISTORY b/http/xulrunner/HISTORY index a7820e6dbe..3c84a7e86e 100644 --- a/http/xulrunner/HISTORY +++ b/http/xulrunner/HISTORY @@ -1,3 +1,7 @@ +2010-07-20 Ladislav Hagara <hgr@vabo.cz> + * DETAILS: 1.9.2.7, FFVERSION=3.6.7, SECURITY_PATCH=15 + * PRE_BUILD, 1000_fix_alignment.patch: removed patch + 2010-06-27 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 1.9.2.6, FFVERSION=3.6.6 |