summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386>2009-03-17 23:34:45 +0000
committerzhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386>2009-03-17 23:34:45 +0000
commitb451bbf9f9f02eaeda0532aa70688aaa1155371f (patch)
tree16d4b75708ad812aa2cfea009c0198189daaec24
parent8e8e1ec2f12f33bc3d6a3a5a43ed8b238739b44b (diff)
downloadgooglemock-b451bbf9f9f02eaeda0532aa70688aaa1155371f.tar.gz
Adds release note for 1.1.0 and switches to use gtest 1.3.0.
git-svn-id: http://googlemock.googlecode.com/svn/trunk@117 8415998a-534a-0410-bf83-d39667b30386
-rw-r--r--CHANGES11
-rw-r--r--CONTRIBUTORS1
-rw-r--r--README2
-rw-r--r--configure.ac2
4 files changed, 14 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index be9b0ac..8b62def 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,14 @@
+Changes for 1.1.0:
+
+ * New feature: ability to use Google Mock with any testing framework.
+ * New feature: macros for easily defining new matchers
+ * New feature: macros for easily defining new actions.
+ * New feature: more container matchers.
+ * 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.
+
Changes for 1.0.0:
* Initial Open Source release of Google Mock
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 5020947..a661d8f 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -25,6 +25,7 @@ Markus Heule <markus.heule@gmail.com>
Matthew Simmons <simmonmt@acm.org>
Mike Bland <mbland@google.com>
Neal Norwitz <nnorwitz@gmail.com>
+Nermin Ozkiranartli <nermin@google.com>
Owen Carlsen <ocarlsen@google.com>
Paneendra Ba <paneendra@google.com>
Paul Menage <menage@google.com>
diff --git a/README b/README
index 9498041..604c013 100644
--- a/README
+++ b/README
@@ -41,7 +41,7 @@ with Google Test (http://code.google.com/p/googletest/), although
eventually we plan to support other C++ testing frameworks. You can
use either the copy of Google Test that comes with Google Mock, or a
compatible version you already have. This version of Google Mock
-requires Google Test 1.2.1.
+requires Google Test 1.3.0.
Google Mock depends on advanced C++ features and thus requires a more
modern compiler. The following are needed to use Google Mock:
diff --git a/configure.ac b/configure.ac
index 65a48b4..c317979 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_INIT([Google C++ Mocking Framework],
- [1.0.0],
+ [1.1.0],
[googlemock@googlegroups.com],
[gmock])