Merge branch 'master' into fix-argc

687964c8 · Conor Burgess · GitHub · f11a8f91 · 02a8ca87 · 687964c8
Unverified Commit 687964c8 authored Aug 17, 2018 by Conor Burgess Committed by GitHub Aug 17, 2018
20 changed files
--- a/googlemock/test/gmock_leak_test_.cc
+++ b/googlemock/test/gmock_leak_test_.cc
--- a/googlemock/test/gmock_link2_test.cc
+++ b/googlemock/test/gmock_link2_test.cc
--- a/googlemock/test/gmock_link_test.cc
+++ b/googlemock/test/gmock_link_test.cc
--- a/googlemock/test/gmock_link_test.h
+++ b/googlemock/test/gmock_link_test.h
--- a/googlemock/test/gmock_output_test.py
+++ b/googlemock/test/gmock_output_test.py
--- a/googlemock/test/gmock_output_test_.cc
+++ b/googlemock/test/gmock_output_test_.cc
--- a/googlemock/test/gmock_output_test_golden.txt
+++ b/googlemock/test/gmock_output_test_golden.txt
--- a/googlemock/test/gmock_stress_test.cc
+++ b/googlemock/test/gmock_stress_test.cc
--- a/googlemock/test/gmock_test.cc
+++ b/googlemock/test/gmock_test.cc
--- a/googlemock/test/gmock_test_utils.py
+++ b/googlemock/test/gmock_test_utils.py
--- 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/internal_utils.cmake
+++ b/googletest/cmake/internal_utils.cmake
--- a/googletest/docs/AdvancedGuide.md
+++ b/googletest/docs/AdvancedGuide.md
--- a/googletest/docs/Documentation.md
+++ b/googletest/docs/Documentation.md
--- a/googletest/docs/FAQ.md
+++ b/googletest/docs/FAQ.md
--- a/googletest/docs/Primer.md
+++ b/googletest/docs/Primer.md
--- a/googletest/docs/Samples.md
+++ b/googletest/docs/Samples.md
--- a/googletest/docs/XcodeGuide.md
+++ b/googletest/docs/XcodeGuide.md