From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Sat, 30 Jul 2011 08:10:16 +0000 (+0200)
Subject: bumped version to 1.2.0-DEV
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=f918219cf958f72ca25d53b9b7498dc778da8c16;p=web%2Fkonrad%2Ftwig.git

bumped version to 1.2.0-DEV
---

diff --git a/CHANGELOG b/CHANGELOG
index d830255..9f596b4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+* 1.2.0
+
+n/a
+
 * 1.1.2 (2011-07-30)
 
  * fixed json_encode filter on PHP 5.2
diff --git a/lib/Twig/Environment.php b/lib/Twig/Environment.php
index e52f34d..d706f6c 100644
--- a/lib/Twig/Environment.php
+++ b/lib/Twig/Environment.php
@@ -17,7 +17,7 @@
  */
 class Twig_Environment
 {
-    const VERSION = '1.1.2';
+    const VERSION = '1.2.0-DEV';
 
     protected $charset;
     protected $loader;