From 730aa25bedeee922c361640f6e4c01e4e6bac998 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sat, 3 Aug 2013 17:50:09 +0200 Subject: [PATCH] bumped version to 1.14.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 80ff9d2..d321f11 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +* 1.14.0 (2013-XX-XX) + + * n/a + * 1.13.2 (2013-08-03) * fixed the error line number for an error occurs in and embedded template diff --git a/composer.json b/composer.json index 67a08aa..e0fd606 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.13-dev" + "dev-master": "1.14-dev" } } } diff --git a/ext/twig/php_twig.h b/ext/twig/php_twig.h index 1cf0ad4..5a9ff1c 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.13.2" +#define PHP_TWIG_VERSION "1.14.0-DEV" #include "php.h" diff --git a/lib/Twig/Environment.php b/lib/Twig/Environment.php index 6d4c5c5..c726b08 100644 --- a/lib/Twig/Environment.php +++ b/lib/Twig/Environment.php @@ -16,7 +16,7 @@ */ class Twig_Environment { - const VERSION = '1.13.2'; + const VERSION = '1.14.0-DEV'; protected $charset; protected $loader; -- 1.7.2.5