From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Wed, 7 Dec 2011 07:11:23 +0000 (+0100)
Subject: bumped version to 1.5.0-DEV
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=460ba4d6c77135a51805d2bb0b7e77ecdc20fe96;p=konrad%2Ftwig.git

bumped version to 1.5.0-DEV
---

diff --git a/CHANGELOG b/CHANGELOG
index 2d05ca6..f0d2816 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+* 1.5.0
+
+ * ...
+
 * 1.4.0 (2011-12-07)
 
  * fixed lexer when using big numbers (> PHP_INT_MAX)
diff --git a/composer.json b/composer.json
index eb47f6d..3a939ce 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.4.0",
+    "version": "1.5.0",
     "license": "BSD",
     "authors": [
         {
diff --git a/ext/twig/twig.c b/ext/twig/twig.c
index 1c306a2..70a0e2a 100644
--- a/ext/twig/twig.c
+++ b/ext/twig/twig.c
@@ -54,7 +54,7 @@ zend_module_entry twig_module_entry = {
 	PHP_RSHUTDOWN(twig),
 	PHP_MINFO(twig),
 #if ZEND_MODULE_API_NO >= 20010901
-	"1.4.0",
+	"1.5.0-DEV",
 #endif
 	STANDARD_MODULE_PROPERTIES
 };
diff --git a/lib/Twig/Environment.php b/lib/Twig/Environment.php
index d7e5910..6c7550d 100644
--- a/lib/Twig/Environment.php
+++ b/lib/Twig/Environment.php
@@ -17,7 +17,7 @@
  */
 class Twig_Environment
 {
-    const VERSION = '1.4.0';
+    const VERSION = '1.5.0-DEV';
 
     protected $charset;
     protected $loader;