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
15 changed files
--- a/googlemock/test/gmock-spec-builders_test.cc
+++ b/googlemock/test/gmock-spec-builders_test.cc
--- a/googlemock/test/gmock_all_test.cc
+++ b/googlemock/test/gmock_all_test.cc
--- a/googlemock/test/gmock_ex_test.cc
+++ b/googlemock/test/gmock_ex_test.cc
--- a/googlemock/test/gmock_leak_test.py
+++ b/googlemock/test/gmock_leak_test.py
--- a/googlemock/test/gmock_leak_test_.cc
+++ b/googlemock/test/gmock_leak_test_.cc
--- a/googlemock/test/gmock_link2_test.cc
+++ b/googlemock/test/gmock_link2_test.cc
--- a/googlemock/test/gmock_link_test.cc
+++ b/googlemock/test/gmock_link_test.cc
--- a/googlemock/test/gmock_link_test.h
+++ b/googlemock/test/gmock_link_test.h
--- a/googlemock/test/gmock_output_test.py
+++ b/googlemock/test/gmock_output_test.py
--- a/googlemock/test/gmock_output_test_.cc
+++ b/googlemock/test/gmock_output_test_.cc
--- a/googlemock/test/gmock_output_test_golden.txt
+++ b/googlemock/test/gmock_output_test_golden.txt
--- a/googlemock/test/gmock_stress_test.cc
+++ b/googlemock/test/gmock_stress_test.cc
--- a/googlemock/test/gmock_test.cc
+++ b/googlemock/test/gmock_test.cc
--- a/googlemock/test/gmock_test_utils.py
+++ b/googlemock/test/gmock_test_utils.py
--- a/googletest/docs/ProjectHome.md
+++ b/googletest/docs/ProjectHome.md