From e74205e21e548313b68929e59476987ddcb5a955 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 5 Jan 2012 15:35:20 +0100 Subject: [PATCH] bumped version to 1.6.0-DEV --- CHANGELOG | 4 ++++ composer.json | 1 - ext/twig/php_twig.h | 2 +- lib/Twig/Environment.php | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 74b6915..381542d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +* 1.6.0-DEV + + * n/a + * 1.5.1 (2012-01-05) * fixed a regression when parsing strings diff --git a/composer.json b/composer.json index 5e10735..ae83329 100644 --- a/composer.json +++ b/composer.json @@ -4,7 +4,6 @@ "description": "Twig, the flexible, fast, and secure template language for PHP", "keywords": ["templating"], "homepage": "http://twig.sensiolabs.org", - "version": "1.5.1", "license": "BSD", "authors": [ { diff --git a/ext/twig/php_twig.h b/ext/twig/php_twig.h index 71b6b0f..5467f03 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.5.1" +#define PHP_TWIG_VERSION "1.6.0-DEV" #include "php.h" diff --git a/lib/Twig/Environment.php b/lib/Twig/Environment.php index b11f727..4ea903a 100644 --- a/lib/Twig/Environment.php +++ b/lib/Twig/Environment.php @@ -17,7 +17,7 @@ */ class Twig_Environment { - const VERSION = '1.5.1'; + const VERSION = '1.6.0-DEV'; protected $charset; protected $loader; -- 1.7.2.5