Merge branch 'isnice' of https://github.com/BrukerJWD/googletest into isnice

96d16157 · Jonathan Wendeborn · 386391b0 · 8c82ba48 · 96d16157 · 96d16157
Unverified Commit 96d16157 authored Oct 16, 2018 by Jonathan Wendeborn
20 changed files
--- a/googlemock/msvc/2015/gmock_main.vcxproj
+++ b/googlemock/msvc/2015/gmock_main.vcxproj
--- a/googlemock/msvc/2015/gmock_test.vcxproj
+++ b/googlemock/msvc/2015/gmock_test.vcxproj
--- a/googlemock/scripts/fuse_gmock_files.py
+++ b/googlemock/scripts/fuse_gmock_files.py
--- a/googlemock/scripts/generator/README
+++ b/googlemock/scripts/generator/README
--- a/googlemock/scripts/generator/cpp/ast.py
+++ b/googlemock/scripts/generator/cpp/ast.py
--- a/googlemock/scripts/generator/cpp/gmock_class_test.py
+++ b/googlemock/scripts/generator/cpp/gmock_class_test.py
--- a/googlemock/scripts/upload.py
+++ b/googlemock/scripts/upload.py
--- a/googlemock/src/gmock-all.cc
+++ b/googlemock/src/gmock-all.cc
--- a/googlemock/src/gmock-cardinalities.cc
+++ b/googlemock/src/gmock-cardinalities.cc
--- a/googlemock/src/gmock-internal-utils.cc
+++ b/googlemock/src/gmock-internal-utils.cc
--- a/googlemock/src/gmock-matchers.cc
+++ b/googlemock/src/gmock-matchers.cc
--- a/googlemock/src/gmock-spec-builders.cc
+++ b/googlemock/src/gmock-spec-builders.cc
--- a/googlemock/src/gmock.cc
+++ b/googlemock/src/gmock.cc
--- a/googlemock/src/gmock_main.cc
+++ b/googlemock/src/gmock_main.cc
--- a/googlemock/test/BUILD.bazel
+++ b/googlemock/test/BUILD.bazel
--- a/googlemock/test/gmock-actions_test.cc
+++ b/googlemock/test/gmock-actions_test.cc
--- a/googlemock/test/gmock-cardinalities_test.cc
+++ b/googlemock/test/gmock-cardinalities_test.cc
--- a/googlemock/test/gmock-generated-actions_test.cc
+++ b/googlemock/test/gmock-generated-actions_test.cc
--- a/googlemock/test/gmock-generated-function-mockers_test.cc
+++ b/googlemock/test/gmock-generated-function-mockers_test.cc
--- a/googlemock/test/gmock-generated-internal-utils_test.cc
+++ b/googlemock/test/gmock-generated-internal-utils_test.cc