From af1bfe95166946631160a0cbcf9a20963bb1be5e Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 19 Oct 2012 12:48:39 +0200 Subject: [PATCH] bumped version to 1.11.0-DEV --- CHANGELOG | 4 ++++ composer.json | 2 +- ext/twig/php_twig.h | 2 +- lib/Twig/Environment.php | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index b31fc68..3784432 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +* 1.11.0 (2012-XX-XX) + + * n/a + * 1.10.3 (2012-10-19) * fixed wrong template location in some error messages diff --git a/composer.json b/composer.json index 463d1f2..3bbc5ca 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.10-dev" + "dev-master": "1.11-dev" } } } diff --git a/ext/twig/php_twig.h b/ext/twig/php_twig.h index 7f40423..f9809c2 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.10.3" +#define PHP_TWIG_VERSION "1.11.0-DEV" #include "php.h" diff --git a/lib/Twig/Environment.php b/lib/Twig/Environment.php index da9b673..9763db8 100644 --- a/lib/Twig/Environment.php +++ b/lib/Twig/Environment.php @@ -17,7 +17,7 @@ */ class Twig_Environment { - const VERSION = '1.10.3'; + const VERSION = '1.11.0-DEV'; protected $charset; protected $loader; -- 1.7.2.5