trunk update to 1.6

This commit is contained in:
Garvin Hicking 2009-12-08 13:19:25 +00:00
parent 9c30b3068d
commit 4996015ab4
2 changed files with 4 additions and 1 deletions

View File

@ -1,5 +1,8 @@
# $Id$ # $Id$
Version 1.6 ()
------------------------------------------------------------------------
Version 1.5 () Version 1.5 ()
------------------------------------------------------------------------ ------------------------------------------------------------------------

View File

@ -45,7 +45,7 @@ if (defined('USE_MEMSNAP')) {
} }
// The version string // The version string
$serendipity['version'] = '1.5-beta2'; $serendipity['version'] = '1.6-alpha1';
// Setting this to 'false' will enable debugging output. All alpa/beta/cvs snapshot versions will emit debug information by default. To increase the debug level (to enable Smarty debugging), set this flag to 'debug'. // Setting this to 'false' will enable debugging output. All alpa/beta/cvs snapshot versions will emit debug information by default. To increase the debug level (to enable Smarty debugging), set this flag to 'debug'.
$serendipity['production'] = (preg_match('@\-(alpha|beta|cvs)@', $serendipity['version']) ? false : true); $serendipity['production'] = (preg_match('@\-(alpha|beta|cvs)@', $serendipity['version']) ? false : true);