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/googletest/README.md
+++ b/googletest/README.md
--- a/googletest/build-aux/.keep
+++ b/googletest/build-aux/.keep
--- a/cmake/internal_utils.cmake
+++ b/cmake/internal_utils.cmake
--- a/codegear/gtest.cbproj
+++ b/codegear/gtest.cbproj
--- a/codegear/gtest.groupproj
+++ b/codegear/gtest.groupproj
--- a/codegear/gtest_all.cc
+++ b/codegear/gtest_all.cc
--- a/codegear/gtest_link.cc
+++ b/codegear/gtest_link.cc
--- a/codegear/gtest_main.cbproj
+++ b/codegear/gtest_main.cbproj
--- a/codegear/gtest_unittest.cbproj
+++ b/codegear/gtest_unittest.cbproj
--- a/configure.ac
+++ b/configure.ac
--- a/docs/AdvancedGuide.md
+++ b/docs/AdvancedGuide.md
--- a/docs/DevGuide.md
+++ b/docs/DevGuide.md
--- a/docs/Documentation.md
+++ b/docs/Documentation.md
--- a/docs/FAQ.md
+++ b/docs/FAQ.md
--- a/docs/Primer.md
+++ b/docs/Primer.md
--- a/docs/PumpManual.md
+++ b/docs/PumpManual.md
--- a/docs/Samples.md
+++ b/docs/Samples.md
--- a/docs/V1_5_AdvancedGuide.md
+++ b/docs/V1_5_AdvancedGuide.md
--- a/docs/V1_5_Documentation.md
+++ b/docs/V1_5_Documentation.md
--- a/docs/V1_5_FAQ.md
+++ b/docs/V1_5_FAQ.md