merge back with HEAD for 7.7.0

2009-03-05 16:19:12 +00:00 · 2009-03-05 16:19:12 +00:00 · 04105713f0
commit 04105713f0
parent 426bc41b04
23 changed files with 120 additions and 60 deletions
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@ -1,3 +1,6 @@
+7.7.0
+ - fixed: Template parser cannot be set
+
 7.6.14
 - fixed: IE6 shows Admin Bar over Asset Manager
 - fixed #9808: Search i18n 
--- a/docs/create.sql
+++ b/docs/create.sql
--- a/docs/previousVersion.sql
+++ b/docs/previousVersion.sql
--- a/docs/upgrades/packages-7.6.14/matrix-default-detailed-listing.wgpkg
+++ b/docs/upgrades/packages-7.6.14/matrix-default-detailed-listing.wgpkg
--- a/docs/upgrades/upgrade_7.6.14-7.7.0.pl
+++ b/docs/upgrades/upgrade_7.6.14-7.7.0.pl
@ -117,6 +117,8 @@ sub upgradeConfigFiles {
    print "DONE!\n" unless $quiet;
 }

+
+
 # -------------- DO NOT EDIT BELOW THIS LINE --------------------------------

 #----------------------------------------------------------------------------