prepared 1.2.0 release

diff --git a/CHANGELOG b/CHANGELOG
index 4a45d74..dbe8f3e 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,8 @@
-* 1.2.0 (2011-09-10)
+* 1.2.0 (2011-09-13)
+
+no changes
+
+* 1.2.0-RC1 (2011-09-10)
 
  * enhanced the exception when a tag remains unclosed
  * added support for empty Countable objects for the "empty" test

diff --git a/lib/Twig/Environment.php b/lib/Twig/Environment.php
index 63ec2d2..b91c80c 100644 (file)
--- a/lib/Twig/Environment.php
+++ b/lib/Twig/Environment.php
@@ -17,7 +17,7 @@
  */
 class Twig_Environment
 {
-    const VERSION = '1.2.0-RC1';
+    const VERSION = '1.2.0';
 
     protected $charset;
     protected $loader;