From: Fabien Potencier Date: Sat, 4 Feb 2012 07:38:18 +0000 (+0100) Subject: bumped version to 1.7.0-DEV X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=203945602bd44692caa08aca7e27d124695826ef;p=web%2Fkonrad%2Ftwig.git bumped version to 1.7.0-DEV --- diff --git a/CHANGELOG b/CHANGELOG index 0f6abc7..1eeaac0 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +* 1.7.0-DEV + + * n/a + * 1.6.0 (2012-02-04) * fixed raw blocks when used with the whitespace trim option diff --git a/composer.json b/composer.json index 0aa9abc..0138ed0 100644 --- a/composer.json +++ b/composer.json @@ -4,7 +4,7 @@ "description": "Twig, the flexible, fast, and secure template language for PHP", "keywords": ["templating"], "homepage": "http://twig.sensiolabs.org", - "version": "1.6.0", + "version": "1.7.0", "license": "BSD", "authors": [ { diff --git a/ext/twig/php_twig.h b/ext/twig/php_twig.h index 23195bf..f00d9b1 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" +#define PHP_TWIG_VERSION "1.7.0-DEV" #include "php.h" diff --git a/lib/Twig/Environment.php b/lib/Twig/Environment.php index 1a743f7..6a84e83 100644 --- a/lib/Twig/Environment.php +++ b/lib/Twig/Environment.php @@ -17,7 +17,7 @@ */ class Twig_Environment { - const VERSION = '1.6.0'; + const VERSION = '1.7.0-DEV'; protected $charset; protected $loader;