summaryrefslogtreecommitdiffstats
path: root/googlemock/README.md
diff options
context:
space:
mode:
authorAndy Getz <durandal@google.com>2020-11-03 03:26:39 (GMT)
committerAndy Getz <durandal@google.com>2020-11-03 03:26:39 (GMT)
commitfb98f7447e5d2e498d6458dcd5c888fdeaae82bc (patch)
treec6726295057212721e01932b309e9e31cc407a8c /googlemock/README.md
parent9fd2843866113227df00525b072db02bb8126b94 (diff)
parent242ee2720ce245ab1278531d0d9c3ba94660c8ba (diff)
downloadgoogletest-fb98f7447e5d2e498d6458dcd5c888fdeaae82bc.zip
googletest-fb98f7447e5d2e498d6458dcd5c888fdeaae82bc.tar.gz
googletest-fb98f7447e5d2e498d6458dcd5c888fdeaae82bc.tar.bz2
Merge pull request #3008 from hyukmyeong:update_tutorial
PiperOrigin-RevId: 340286884
Diffstat (limited to 'googlemock/README.md')
-rw-r--r--googlemock/README.md10
1 files changed, 5 insertions, 5 deletions
diff --git a/googlemock/README.md b/googlemock/README.md
index 11414f9..daafe28 100644
--- a/googlemock/README.md
+++ b/googlemock/README.md
@@ -35,10 +35,10 @@ Details and examples can be found here:
* [gMock Cookbook](docs/cook_book.md)
* [gMock Cheat Sheet](docs/cheat_sheet.md)
-Please note that code under scripts/generator/ is from the [cppclean
-project](http://code.google.com/p/cppclean/) and under the Apache
-License, which is different from Google Mock's license.
+Please note that code under scripts/generator/ is from the
+[cppclean project](http://code.google.com/p/cppclean/) and under the Apache
+License, which is different from GoogleMock's license.
-Google Mock is a part of
-[Google Test C++ testing framework](http://github.com/google/googletest/) and a
+GoogleMock is a part of
+[GoogleTest C++ testing framework](http://github.com/google/googletest/) and a
subject to the same requirements.