From 9154d27622a349fb1986cb9d48014c464a0e9d5b Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sat, 4 Feb 2012 08:34:52 +0100 Subject: [PATCH] prepared the 1.6.0 release --- CHANGELOG | 2 +- ext/twig/php_twig.h | 2 +- lib/Twig/Environment.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 6011029..0f6abc7 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,4 @@ -* 1.6.0-DEV +* 1.6.0 (2012-02-04) * fixed raw blocks when used with the whitespace trim option * made a speed optimization to macro calls when imported via the "from" tag diff --git a/ext/twig/php_twig.h b/ext/twig/php_twig.h index 5467f03..23195bf 100644 --- a/ext/twig/php_twig.h +++ b/ext/twig/php_twig.h @@ -15,7 +15,7 @@ #ifndef PHP_TWIG_H #define PHP_TWIG_H -#define PHP_TWIG_VERSION "1.6.0-DEV" +#define PHP_TWIG_VERSION "1.6.0" #include "php.h" diff --git a/lib/Twig/Environment.php b/lib/Twig/Environment.php index 0fd8371..1a743f7 100644 --- a/lib/Twig/Environment.php +++ b/lib/Twig/Environment.php @@ -17,7 +17,7 @@ */ class Twig_Environment { - const VERSION = '1.6.0-DEV'; + const VERSION = '1.6.0'; protected $charset; protected $loader; -- 1.7.2.5