From 548ed8210a603320ff7a996cebdfc28609d28196 Mon Sep 17 00:00:00 2001
From: vladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925>
Date: Thu, 11 Dec 2008 18:46:41 +0000
Subject: Merged release 1.2.1 updates to trunk

git-svn-id: http://googletest.googlecode.com/svn/trunk@167 861a406c-534a-0410-8894-cb66d6ee9925
---
 CHANGES | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'CHANGES')

diff --git a/CHANGES b/CHANGES
index 533b327..5abc4bf 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,12 @@
+Changes for 1.2.1:
+
+ * Compatibility fixes for Linux IA-64 and IBM z/OS.
+ * Added support for using Boost and other TR1 implementations.
+ * Changes to the build scripts to support upcoming release of Google C++
+   Mocking Framework.
+ * Added Makefile to the distribution package.
+ * Improved build instructions in README.
+
 Changes for 1.2.0:
 
  * New feature: value-parameterized tests.
-- 
cgit v1.2.3