Merge pull request #512 from google/unification

Unify googlemock into googletest

Merge pull request #512 from google/unification
Unify googlemock into googletest
0b6d3b19 · Billy Donahue · c8044924 · 661699bf · 0b6d3b19 · 0b6d3b19
Commit 0b6d3b19 authored Aug 25, 2015 by Billy Donahue
20 changed files
--- a/googlemock/scripts/gmock_doctor.py
+++ b/googlemock/scripts/gmock_doctor.py
--- a/scripts/upload.py
+++ b/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