diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2017-08-14 15:29:51 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-14 15:29:51 -0700 |
| commit | 08b1a1f73cec48481ec3e477e8c247e7aa534df5 (patch) | |
| tree | 7d9b6428b2661baf08c8e50bbd9fa2eac6b54816 /googlemock/CHANGES | |
| parent | 3f3a3ada2022a8b4255b408ef5d2ab439e987c08 (diff) | |
| parent | e0fc65c5fbfe4e50a0369d032e9b2811b4b7db77 (diff) | |
| download | googletest-08b1a1f73cec48481ec3e477e8c247e7aa534df5.tar.gz googletest-08b1a1f73cec48481ec3e477e8c247e7aa534df5.tar.bz2 googletest-08b1a1f73cec48481ec3e477e8c247e7aa534df5.zip | |
Merge branch 'master' into master
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>(). |