Merge branch 'master' into patch-1

7e7e3a6f · Gennadiy Civil · GitHub · b50b2f77 · 997d343d · 7e7e3a6f
Unverified Commit 7e7e3a6f authored Aug 15, 2018 by Gennadiy Civil Committed by GitHub Aug 15, 2018
4 changed files
--- a/googletest/xcode/Config/FrameworkTarget.xcconfig
+++ b/googletest/xcode/Config/FrameworkTarget.xcconfig
--- a/googletest/xcode/Config/General.xcconfig
+++ b/googletest/xcode/Config/General.xcconfig
--- a/googletest/xcode/Config/ReleaseProject.xcconfig
+++ b/googletest/xcode/Config/ReleaseProject.xcconfig
--- a/googletest/xcode/Config/StaticLibraryTarget.xcconfig
+++ b/googletest/xcode/Config/StaticLibraryTarget.xcconfig