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/include/gtest/internal/gtest-port.h
+++ b/include/gtest/internal/gtest-port.h
--- a/include/gtest/internal/gtest-string.h
+++ b/include/gtest/internal/gtest-string.h
--- a/include/gtest/internal/gtest-tuple.h
+++ b/include/gtest/internal/gtest-tuple.h
--- a/include/gtest/internal/gtest-tuple.h.pump
+++ b/include/gtest/internal/gtest-tuple.h.pump
--- a/include/gtest/internal/gtest-type-util.h
+++ b/include/gtest/internal/gtest-type-util.h
--- a/include/gtest/internal/gtest-type-util.h.pump
+++ b/include/gtest/internal/gtest-type-util.h.pump
--- a/m4/acx_pthread.m4
+++ b/m4/acx_pthread.m4
--- a/m4/gtest.m4
+++ b/m4/gtest.m4
--- a/make/Makefile
+++ b/make/Makefile
--- a/msvc/gtest-md.sln
+++ b/msvc/gtest-md.sln
--- a/msvc/gtest-md.vcproj
+++ b/msvc/gtest-md.vcproj
--- a/msvc/gtest.sln
+++ b/msvc/gtest.sln
--- a/msvc/gtest.vcproj
+++ b/msvc/gtest.vcproj
--- a/msvc/gtest_main-md.vcproj
+++ b/msvc/gtest_main-md.vcproj
--- a/msvc/gtest_main.vcproj
+++ b/msvc/gtest_main.vcproj
--- a/msvc/gtest_prod_test-md.vcproj
+++ b/msvc/gtest_prod_test-md.vcproj
--- a/msvc/gtest_prod_test.vcproj
+++ b/msvc/gtest_prod_test.vcproj
--- a/msvc/gtest_unittest-md.vcproj
+++ b/msvc/gtest_unittest-md.vcproj
--- a/msvc/gtest_unittest.vcproj
+++ b/msvc/gtest_unittest.vcproj
--- a/samples/prime_tables.h
+++ b/samples/prime_tables.h