From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Tue, 24 Apr 2012 05:50:52 +0000 (+0200)
Subject: bumped version to 1.8.0-DEV
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=40c966885489d1eefb66bdc3d394b006399fca0f;p=web%2Fkonrad%2Ftwig.git

bumped version to 1.8.0-DEV
---

diff --git a/CHANGELOG b/CHANGELOG
index a33c19f..d1351fb 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+* 1.8.0 (2012-XX-XX)
+
+ * n/A
+
 * 1.7.0 (2012-04-24)
 
  * fixed template line number in some exceptions
diff --git a/composer.json b/composer.json
index f828a4a..9ca80fc 100644
--- a/composer.json
+++ b/composer.json
@@ -25,7 +25,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.7-dev"
+            "dev-master": "1.8-dev"
         }
     }
 }
diff --git a/ext/twig/php_twig.h b/ext/twig/php_twig.h
index 5d5c069..78f1136 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.7.0"
+#define PHP_TWIG_VERSION "1.8.0-DEV"
 
 #include "php.h"
 
diff --git a/lib/Twig/Environment.php b/lib/Twig/Environment.php
index 09c63eb..81011da 100644
--- a/lib/Twig/Environment.php
+++ b/lib/Twig/Environment.php
@@ -17,7 +17,7 @@
  */
 class Twig_Environment
 {
-    const VERSION = '1.7.0';
+    const VERSION = '1.8.0-DEV';
 
     protected $charset;
     protected $loader;