diff --git a/CHANGELOG b/CHANGELOG index 4794b5042..22d5f9f26 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +* 1.12.0 (2012-XX-XX) + + * n/a + * 1.12.0-RC1 (2012-12-29) * added an include function (does the same as the include tag but in a more flexible way) diff --git a/ext/twig/php_twig.h b/ext/twig/php_twig.h index a73150519..e48061384 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.12.0-RC1" +#define PHP_TWIG_VERSION "1.12.0-DEV" #include "php.h" diff --git a/lib/Twig/Environment.php b/lib/Twig/Environment.php index c2480d535..d8e700ef4 100644 --- a/lib/Twig/Environment.php +++ b/lib/Twig/Environment.php @@ -17,7 +17,7 @@ */ class Twig_Environment { - const VERSION = '1.12.0-RC1'; + const VERSION = '1.12.0-DEV'; protected $charset; protected $loader;