From 2fe59a83d7704de19f9a27f7ebb1f2809bacedb6 Mon Sep 17 00:00:00 2001
From: vladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925>
Date: Thu, 11 Dec 2008 18:45:42 +0000
Subject: [PATCH] Merged release 1.2.1 updates

---
 branches/release-1.2/CHANGES | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/branches/release-1.2/CHANGES b/branches/release-1.2/CHANGES
index 533b327e..5abc4bff 100644
--- a/branches/release-1.2/CHANGES
+++ b/branches/release-1.2/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.