From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Wed, 29 Feb 2012 20:46:35 +0000 (+0100)
Subject: prepared the 1.6.1 release
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=30929fde86f5ee12c863a3b572b0457ce52c140b;p=web%2Fkonrad%2Ftwig.git

prepared the 1.6.1 release
---

diff --git a/CHANGELOG b/CHANGELOG
index 5512dd4..03ab25a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-* 1.7.0-DEV
+* 1.6.1 (2012-02-29)
 
  * fixed Twig C extension
  * removed the creation of Twig_Markup instances when not needed
diff --git a/composer.json b/composer.json
index 0138ed0..293d027 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.7.0",
+    "version": "1.6.1",
     "license": "BSD",
     "authors": [
         {
diff --git a/ext/twig/php_twig.h b/ext/twig/php_twig.h
index f00d9b1..798cac6 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-DEV"
+#define PHP_TWIG_VERSION "1.6.1"
 
 #include "php.h"