Merge pull request #3 from google/master

Update master

Merge pull request #3 from google/master
Update master
85f059f0 · Chris Johnson · GitHub · 130e5aa8 · fdd6a1dc · 85f059f0
Unverified Commit 85f059f0 authored Aug 27, 2019 by Chris Johnson Committed by GitHub Aug 27, 2019
20 changed files
--- a/googlemock/test/gmock_output_test.py
+++ b/googlemock/test/gmock_output_test.py
--- a/googlemock/test/gmock_output_test_golden.txt
+++ b/googlemock/test/gmock_output_test_golden.txt
--- 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/cmake/libgtest.la.in
+++ b/googletest/cmake/libgtest.la.in
--- a/googletest/codegear/gtest.cbproj
+++ b/googletest/codegear/gtest.cbproj
--- a/googletest/codegear/gtest.groupproj
+++ b/googletest/codegear/gtest.groupproj
--- a/googletest/codegear/gtest_all.cc
+++ b/googletest/codegear/gtest_all.cc
--- a/googletest/codegear/gtest_main.cbproj
+++ b/googletest/codegear/gtest_main.cbproj
--- a/googletest/codegear/gtest_unittest.cbproj
+++ b/googletest/codegear/gtest_unittest.cbproj
--- a/googletest/configure.ac
+++ b/googletest/configure.ac
--- a/googletest/docs/XcodeGuide.md
+++ b/googletest/docs/XcodeGuide.md
--- a/googletest/docs/advanced.md
+++ b/googletest/docs/advanced.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
--- a/googletest/docs/samples.md
+++ b/googletest/docs/samples.md