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
14 changed files
--- a/xcode/Config/General.xcconfig
+++ b/xcode/Config/General.xcconfig
--- a/xcode/Config/ReleaseProject.xcconfig
+++ b/xcode/Config/ReleaseProject.xcconfig
--- a/xcode/Config/StaticLibraryTarget.xcconfig
+++ b/xcode/Config/StaticLibraryTarget.xcconfig
--- a/xcode/Config/TestTarget.xcconfig
+++ b/xcode/Config/TestTarget.xcconfig
--- a/xcode/Resources/Info.plist
+++ b/xcode/Resources/Info.plist
--- a/xcode/Samples/FrameworkSample/Info.plist
+++ b/xcode/Samples/FrameworkSample/Info.plist
--- a/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj
+++ b/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj
--- a/xcode/Samples/FrameworkSample/runtests.sh
+++ b/xcode/Samples/FrameworkSample/runtests.sh
--- a/xcode/Samples/FrameworkSample/widget.cc
+++ b/xcode/Samples/FrameworkSample/widget.cc
--- a/xcode/Samples/FrameworkSample/widget.h
+++ b/xcode/Samples/FrameworkSample/widget.h
--- a/xcode/Samples/FrameworkSample/widget_test.cc
+++ b/xcode/Samples/FrameworkSample/widget_test.cc
--- a/xcode/Scripts/runtests.sh
+++ b/xcode/Scripts/runtests.sh
--- a/xcode/Scripts/versiongenerate.py
+++ b/xcode/Scripts/versiongenerate.py
--- a/xcode/gtest.xcodeproj/project.pbxproj
+++ b/xcode/gtest.xcodeproj/project.pbxproj