From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Wed, 4 Jan 2012 13:31:46 +0000 (+0100)
Subject: bumped version to 1.6.0-DEV
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=d76d670b54ec722b70f41b4f68274df8c74b7712;p=web%2Fkonrad%2Ftwig.git

bumped version to 1.6.0-DEV
---

diff --git a/CHANGELOG b/CHANGELOG
index 09626d9..3f089c1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+* 1.6.0-DEV
+
+ * n/a
+
 * 1.5.0 (2012-01-04)
 
  * added Traversable objects support for the join filter
diff --git a/composer.json b/composer.json
index 3a939ce..0aa9abc 100644
--- a/composer.json
+++ b/composer.json
@@ -4,7 +4,7 @@
     "description": "Twig, the flexible, fast, and secure template language for PHP",
     "keywords": ["templating"],
     "homepage": "http://twig.sensiolabs.org",
-    "version": "1.5.0",
+    "version": "1.6.0",
     "license": "BSD",
     "authors": [
         {
diff --git a/ext/twig/php_twig.h b/ext/twig/php_twig.h
index 63f9f9b..5467f03 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.5.0"
+#define PHP_TWIG_VERSION "1.6.0-DEV"
 
 #include "php.h"
 
diff --git a/lib/Twig/Environment.php b/lib/Twig/Environment.php
index cf61542..4ea903a 100644
--- a/lib/Twig/Environment.php
+++ b/lib/Twig/Environment.php
@@ -17,7 +17,7 @@
  */
 class Twig_Environment
 {
-    const VERSION = '1.5.0';
+    const VERSION = '1.6.0-DEV';
 
     protected $charset;
     protected $loader;