From b0ee99d6d69b30a512064c8b4fac536f862a0d23 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 13 Feb 2014 11:36:05 +0100 Subject: [PATCH] bumped version to 1.15.2-DEV --- CHANGELOG | 4 ++++ ext/twig/php_twig.h | 2 +- lib/Twig/Environment.php | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 6be2d65..3b11d66 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +* 1.15.2 (2013-XX-XX) + + * n/a + * 1.15.1 (2013-02-13) * fixed the conversion of the special '0000-00-00 00:00' date diff --git a/ext/twig/php_twig.h b/ext/twig/php_twig.h index 858c0d8..e3c1f2d 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.15.1" +#define PHP_TWIG_VERSION "1.15.2-DEV" #include "php.h" diff --git a/lib/Twig/Environment.php b/lib/Twig/Environment.php index 1fec1a3..3c29c4d 100644 --- a/lib/Twig/Environment.php +++ b/lib/Twig/Environment.php @@ -16,7 +16,7 @@ */ class Twig_Environment { - const VERSION = '1.15.1'; + const VERSION = '1.15.2-DEV'; protected $charset; protected $loader; -- 1.7.2.5