From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Thu, 31 Oct 2013 12:37:55 +0000 (+0100)
Subject: bumped version to 1.15
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=726a40a1b407c6f2ae675a25dcb24b8ce024559a;p=web%2Fkonrad%2Ftwig.git

bumped version to 1.15
---

diff --git a/CHANGELOG b/CHANGELOG
index 0cc9805..3181d05 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-* 1.14.3 (2013-XX-XX)
+* 1.15.0 (2013-XX-XX)
 
  * fixed the C extension sandbox behavior when get or set is prepend to method name
 
diff --git a/composer.json b/composer.json
index e0fd606..799a3eb 100644
--- a/composer.json
+++ b/composer.json
@@ -25,7 +25,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.14-dev"
+            "dev-master": "1.15-dev"
         }
     }
 }
diff --git a/ext/twig/php_twig.h b/ext/twig/php_twig.h
index 021a837..79d2210 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.14.3-DEV"
+#define PHP_TWIG_VERSION "1.15.0-DEV"
 
 #include "php.h"
 
diff --git a/lib/Twig/Environment.php b/lib/Twig/Environment.php
index c707196..bdf7bf5 100644
--- a/lib/Twig/Environment.php
+++ b/lib/Twig/Environment.php
@@ -16,7 +16,7 @@
  */
 class Twig_Environment
 {
-    const VERSION = '1.14.3-DEV';
+    const VERSION = '1.15.0-DEV';
 
     protected $charset;
     protected $loader;