diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2017-08-21 13:11:58 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-21 13:11:58 -0400 |
| commit | 96f7ba83cb225dd9152dcffe3104af093e66510a (patch) | |
| tree | 0cf8937f69d91039df408576db9352d4f2c377d8 /googlemock/CHANGES | |
| parent | b74070cfd90c57b3ef2f80c8a50ca5f505a9e3aa (diff) | |
| parent | 675686a139a731a2c796633e67e9421792363709 (diff) | |
| download | googletest-96f7ba83cb225dd9152dcffe3104af093e66510a.tar.gz googletest-96f7ba83cb225dd9152dcffe3104af093e66510a.tar.bz2 googletest-96f7ba83cb225dd9152dcffe3104af093e66510a.zip | |
Merge branch 'master' into wrong-version-reported
Diffstat (limited to 'googlemock/CHANGES')
| -rw-r--r-- | googlemock/CHANGES | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/googlemock/CHANGES b/googlemock/CHANGES index d6f2f760..4328ece3 100644 --- a/googlemock/CHANGES +++ b/googlemock/CHANGES @@ -94,7 +94,7 @@ Google Test): * 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 + * New feature: the .With() clause for specifying inter-argument constraints. * New feature: actions ReturnArg<k>(), ReturnNew<T>(...), and DeleteArg<k>(). |