prepared the 1.15.0 release

diff --git a/CHANGELOG b/CHANGELOG
index 3ac844b..6c39f7d 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-* 1.15.0 (2013-XX-XX)
+* 1.15.0 (2013-12-06)
 
  * made ignoreStrictCheck in Template::getAttribute() works with __call() methods throwing BadMethodCallException
  * added min and max functions

diff --git a/ext/twig/php_twig.h b/ext/twig/php_twig.h
index 79d2210..6570967 100644 (file)
--- 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.15.0-DEV"
+#define PHP_TWIG_VERSION "1.15.0"
 
 #include "php.h"
 

diff --git a/lib/Twig/Environment.php b/lib/Twig/Environment.php
index bdf7bf5..3b25c5e 100644 (file)
--- a/lib/Twig/Environment.php
+++ b/lib/Twig/Environment.php
@@ -16,7 +16,7 @@
  */
 class Twig_Environment
 {
-    const VERSION = '1.15.0-DEV';
+    const VERSION = '1.15.0';
 
     protected $charset;
     protected $loader;