From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Wed, 30 Oct 2013 08:20:53 +0000 (+0100)
Subject: prepared the 1.14.2 release
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=ca445842fcea4f844d68203ffa2d00f5e3cdea64;p=web%2Fkonrad%2Ftwig.git

prepared the 1.14.2 release
---

diff --git a/CHANGELOG b/CHANGELOG
index 1928339..d2915a1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-* 1.14.2 (2013-XX-XX)
+* 1.14.2 (2013-10-30)
 
  * fixed error filename/line when an error occurs in an included file
  * allowed operators that contain whitespaces to have more than one whitespace
diff --git a/ext/twig/php_twig.h b/ext/twig/php_twig.h
index b6b9d43..4b05ae8 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.2-DEV"
+#define PHP_TWIG_VERSION "1.14.2"
 
 #include "php.h"
 
diff --git a/lib/Twig/Environment.php b/lib/Twig/Environment.php
index 8a6985a..9c886f2 100644
--- a/lib/Twig/Environment.php
+++ b/lib/Twig/Environment.php
@@ -16,7 +16,7 @@
  */
 class Twig_Environment
 {
-    const VERSION = '1.14.2-DEV';
+    const VERSION = '1.14.2';
 
     protected $charset;
     protected $loader;