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/scripts/gtest-config.in
+++ b/scripts/gtest-config.in
--- a/scripts/pump.py
+++ b/scripts/pump.py
--- a/scripts/release_docs.py
+++ b/scripts/release_docs.py
--- a/scripts/test/Makefile
+++ b/scripts/test/Makefile
--- a/googletest/scripts/upload.py
+++ b/googletest/scripts/upload.py
--- a/scripts/upload_gtest.py
+++ b/scripts/upload_gtest.py
--- a/src/gtest-all.cc
+++ b/src/gtest-all.cc
--- a/src/gtest-death-test.cc
+++ b/src/gtest-death-test.cc
--- a/src/gtest-filepath.cc
+++ b/src/gtest-filepath.cc
--- a/src/gtest-internal-inl.h
+++ b/src/gtest-internal-inl.h
--- a/src/gtest-port.cc
+++ b/src/gtest-port.cc
--- a/src/gtest-printers.cc
+++ b/src/gtest-printers.cc
--- a/src/gtest-test-part.cc
+++ b/src/gtest-test-part.cc
--- a/src/gtest-typed-test.cc
+++ b/src/gtest-typed-test.cc
--- a/src/gtest.cc
+++ b/src/gtest.cc
--- a/src/gtest_main.cc
+++ b/src/gtest_main.cc
--- a/test/gtest-death-test_ex_test.cc
+++ b/test/gtest-death-test_ex_test.cc
--- a/test/gtest-death-test_test.cc
+++ b/test/gtest-death-test_test.cc
--- a/test/gtest-filepath_test.cc
+++ b/test/gtest-filepath_test.cc
--- a/test/gtest-linked_ptr_test.cc
+++ b/test/gtest-linked_ptr_test.cc