Merge branch 'master' of https://github.com/google/googletest

6c093a23 · Scott Slack-Smith · c958e26f · d175c8bf · 6c093a23 · 6c093a23
Commit 6c093a23 authored Nov 24, 2017 by Scott Slack-Smith
20 changed files
--- a/googlemock/test/gmock-internal-utils_test.cc
+++ b/googlemock/test/gmock-internal-utils_test.cc
--- a/googlemock/test/gmock-matchers_test.cc
+++ b/googlemock/test/gmock-matchers_test.cc
--- a/googlemock/test/gmock-nice-strict_test.cc
+++ b/googlemock/test/gmock-nice-strict_test.cc
--- a/googlemock/test/gmock-spec-builders_test.cc
+++ b/googlemock/test/gmock-spec-builders_test.cc
--- a/googlemock/test/gmock_test.cc
+++ b/googlemock/test/gmock_test.cc
--- a/googletest/.gitignore
+++ b/googletest/.gitignore
-# python
-*.pyc
--- a/googletest/CMakeLists.txt
+++ b/googletest/CMakeLists.txt
--- a/googletest/Makefile.am
+++ b/googletest/Makefile.am
--- a/googletest/README.md
+++ b/googletest/README.md
--- a/googletest/cmake/gtest.pc.in
+++ b/googletest/cmake/gtest.pc.in
--- a/googletest/cmake/gtest_main.pc.in
+++ b/googletest/cmake/gtest_main.pc.in
--- a/googletest/cmake/internal_utils.cmake
+++ b/googletest/cmake/internal_utils.cmake
--- a/googletest/configure.ac
+++ b/googletest/configure.ac
--- a/googletest/docs/AdvancedGuide.md
+++ b/googletest/docs/AdvancedGuide.md
--- a/googletest/docs/DevGuide.md
+++ b/googletest/docs/DevGuide.md
--- a/googletest/docs/Documentation.md
+++ b/googletest/docs/Documentation.md
--- a/googletest/docs/FAQ.md
+++ b/googletest/docs/FAQ.md
--- a/googletest/docs/Pkgconfig.md
+++ b/googletest/docs/Pkgconfig.md
--- a/googletest/docs/Primer.md
+++ b/googletest/docs/Primer.md
--- a/googletest/docs/PumpManual.md
+++ b/googletest/docs/PumpManual.md