From 2243a14e3d9218292653d2a1d995ebbcc9f25bb4 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 14 Nov 2012 14:32:45 +0100 Subject: [PATCH] switched version to 1.12 --- CHANGELOG | 2 +- composer.json | 2 +- ext/twig/php_twig.h | 2 +- lib/Twig/Environment.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 0e7b85b..c5716be 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,4 @@ -* 1.11.2 (2012-XX-XX) +* 1.12.0 (2012-XX-XX) * added support for extended ternary operator syntaxes diff --git a/composer.json b/composer.json index 3bbc5ca..5530d28 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.11-dev" + "dev-master": "1.12-dev" } } } diff --git a/ext/twig/php_twig.h b/ext/twig/php_twig.h index 9d34084..e480613 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.11.2-DEV" +#define PHP_TWIG_VERSION "1.12.0-DEV" #include "php.h" diff --git a/lib/Twig/Environment.php b/lib/Twig/Environment.php index e80ec1e..5453bcb 100644 --- a/lib/Twig/Environment.php +++ b/lib/Twig/Environment.php @@ -17,7 +17,7 @@ */ class Twig_Environment { - const VERSION = '1.11.2-DEV'; + const VERSION = '1.12.0-DEV'; protected $charset; protected $loader; -- 1.7.2.5