Merge pull request #511 from BillyDonahue/unification

Bring GoogleMock into the GoogleTest repository

Merge pull request #511 from BillyDonahue/unification
Bring GoogleMock into the GoogleTest repository
661699bf · Billy Donahue · 1f87a097 · 8a3c8c93 · 661699bf · 661699bf
Commit 661699bf authored Aug 25, 2015 by Billy Donahue
20 changed files
--- a/googlemock/scripts/upload.py
+++ b/googlemock/scripts/upload.py
--- a/googlemock/scripts/upload_gmock.py
+++ b/googlemock/scripts/upload_gmock.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/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
--- a/googlemock/test/gmock-generated-matchers_test.cc
+++ b/googlemock/test/gmock-generated-matchers_test.cc
--- 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-more-actions_test.cc
+++ b/googlemock/test/gmock-more-actions_test.cc
--- a/googlemock/test/gmock-nice-strict_test.cc
+++ b/googlemock/test/gmock-nice-strict_test.cc
--- a/googlemock/test/gmock-port_test.cc
+++ b/googlemock/test/gmock-port_test.cc