From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Sun, 30 Dec 2012 20:07:31 +0000 (+0100)
Subject: bumped version to 1.12.0-DEV
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=25f7b0c7eb456f5c39f1e8163da538de5d0d717b;p=web%2Fkonrad%2Ftwig.git

bumped version to 1.12.0-DEV
---

diff --git a/CHANGELOG b/CHANGELOG
index 4794b50..22d5f9f 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 a731505..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.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 c2480d5..d8e700e 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;