From 180e74cd35ac73625f4460562ba5360cefd09534 Mon Sep 17 00:00:00 2001
From: vladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925>
Date: Wed, 26 Nov 2008 22:39:11 +0000
Subject: [PATCH] Updated CHANGES and release version for 1.2

---
 CHANGES      | 14 ++++++++++++++
 configure.ac |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index e4e45cdd..533b327e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,17 @@
+Changes for 1.2.0:
+
+ * New feature: value-parameterized tests.
+ * New feature: the ASSERT/EXPECT_(NON)FATAL_FAILURE(_ON_ALL_THREADS)
+   macros.
+ * Changed the XML report format to match JUnit/Ant's.
+ * Added tests to the Xcode project.
+ * Added scons/SConscript for building with SCons.
+ * Added src/gtest-all.cc for building Google Test from a single file.
+ * Fixed compatibility with Solaris and z/OS.
+ * Enabled running Python tests on systems with python 2.3 installed,
+   e.g. Mac OS X 10.4.
+ * Bug fixes.
+
 Changes for 1.1.0:
 
  * New feature: type-parameterized tests.
diff --git a/configure.ac b/configure.ac
index e19bbef7..bb21a603 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 # "[1.0.1]"). It also asumes that there won't be any closing parenthesis
 # between "AC_INIT(" and the closing ")" including comments and strings.
 AC_INIT([Google C++ Testing Framework],
-        [1.1.0],
+        [1.2.0],
         [googletestframework@googlegroups.com],
         [gtest])