Merge branch 'master' of https://github.com/google/googletest into cmake-QNX-fix

# Conflicts: # CMakeLists.txt

Merge branch 'master' of https://github.com/google/googletest into cmake-QNX-fix
# Conflicts: # CMakeLists.txt
937b3ce9 · Mark Jan van Kampen · 44517f98 · 23b2a3b1 · 937b3ce9 · 937b3ce9
Unverified Commit 937b3ce9 authored Feb 17, 2020 by Mark Jan van Kampen
12 changed files
--- a/googlemock/test/gmock-matchers_test.cc
+++ b/googlemock/test/gmock-matchers_test.cc
--- a/googlemock/test/gmock_all_test.cc
+++ b/googlemock/test/gmock_all_test.cc
@@ -38,7 +38,6 @@
 #include "test/gmock-actions_test.cc"
 #include "test/gmock-cardinalities_test.cc"
 #include "test/gmock-generated-actions_test.cc"
-#include "test/gmock-generated-function-mockers_test.cc"
 #include "test/gmock-generated-matchers_test.cc"
 #include "test/gmock-internal-utils_test.cc"
 #include "test/gmock-matchers_test.cc"

--- a/googletest/docs/advanced.md
+++ b/googletest/docs/advanced.md
--- a/googletest/include/gtest/gtest-matchers.h
+++ b/googletest/include/gtest/gtest-matchers.h
--- a/googletest/include/gtest/gtest-printers.h
+++ b/googletest/include/gtest/gtest-printers.h
--- a/googletest/include/gtest/gtest.h
+++ b/googletest/include/gtest/gtest.h
--- a/googletest/include/gtest/internal/gtest-port.h
+++ b/googletest/include/gtest/internal/gtest-port.h
--- a/googletest/samples/prime_tables.h
+++ b/googletest/samples/prime_tables.h
--- a/googletest/src/gtest-matchers.cc
+++ b/googletest/src/gtest-matchers.cc
--- a/googletest/test/BUILD.bazel
+++ b/googletest/test/BUILD.bazel
--- a/googletest/test/googletest-printers-test.cc
+++ b/googletest/test/googletest-printers-test.cc
--- a/googletest/test/googletest-test2_test.cc
+++ b/googletest/test/googletest-test2_test.cc