Updates CHANGES.

git-svn-id: http://googlemock.googlecode.com/svn/trunk@195 8415998a-534a-0410-bf83-d39667b30386

1 files changed, 24 insertions, 1 deletions

diff --git a/CHANGES b/CHANGES
index 8b62def..9845eb9 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,26 @@
+Changes for 1.2.0 (up to r194):
+
+ * New feature: own implementation of TR1 tuple (no more dependency on
+   Boost!).
+ * New feature: support for Visual C++ 7.1.
+ * New feature: --gmock_catch_leaked_mocks for detecting leaked mocks.
+ * New feature: ACTION_TEMPLATE for defining templatized actions.
+ * New feature: the .After() clause for specifying expectation order.
+ * New feature: the .With() clause for for specifying inter-argument
+   constraints.
+ * New feature: actions ReturnArg<k>(), ReturnNew<T>(...), and
+   DeleteArg<k>().
+ * New feature: matchers Key(m), Args<...>(m), AllArgs(m), and
+   Contains(m).
+ * New feature: functions Value(x, m) and SafeMatcherCast<T>(m).
+ * New feature: copying a mock object is rejected at compile time.
+ * New feature: a script for fusing all Google Mock and Google Test
+   source files for easy deployment.
+ * Improved the Google Mock doctor to diagnose more diseases.
+ * Improved the Google Mock generator script.
+ * Compatibility fixes for Mac OS X, Symbian, and gcc.
+ * Bug fixes and implementation clean-ups.
+
 Changes for 1.1.0:
 
  * New feature: ability to use Google Mock with any testing framework.
@@ -7,7 +30,7 @@ Changes for 1.1.0:
  * New feature: actions for accessing function arguments and throwing
    exceptions.
  * Improved the Google Mock doctor script for diagnosing compiler errors.
- * Bug fixes and implementation clean-up.
+ * Bug fixes and implementation clean-ups.
 
 Changes for 1.0.0: