diff --git a/CHANGELOG b/CHANGELOG index 80ff9d2d0..d321f113a 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 67a08aad9..e0fd60654 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 1cf0ad446..5a9ff1cf8 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 6d4c5c574..c726b088b 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;