From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Tue, 15 Jan 2013 20:09:05 +0000 (+0100)
Subject: bumped version to 1.12.2-DEV
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=2a7d317cf95cfcd2a9106ad14e4864bbf8bd78a4;p=web%2Fkonrad%2Ftwig.git

bumped version to 1.12.2-DEV
---

diff --git a/CHANGELOG b/CHANGELOG
index 25513cf..961f836 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+* 1.12.2 (2013-XX-XX)
+
+ * n/a
+
 * 1.12.1 (2013-01-15)
 
  * added support for object instances as the second argument of the constant function
diff --git a/ext/twig/php_twig.h b/ext/twig/php_twig.h
index 1508b0e..9a6f9e9 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.1"
+#define PHP_TWIG_VERSION "1.12.2-DEV"
 
 #include "php.h"
 
diff --git a/lib/Twig/Environment.php b/lib/Twig/Environment.php
index eabbf0a..e3384af 100644
--- a/lib/Twig/Environment.php
+++ b/lib/Twig/Environment.php
@@ -17,7 +17,7 @@
  */
 class Twig_Environment
 {
-    const VERSION = '1.12.1';
+    const VERSION = '1.12.2-DEV';
 
     protected $charset;
     protected $loader;