Merge branch 'master' into cross-testing-patch-1

11f5a274 · Gennadiy Civil · GitHub · 008e54c1 · 66bd580b · 11f5a274
Unverified Commit 11f5a274 authored Aug 08, 2018 by Gennadiy Civil Committed by GitHub Aug 08, 2018
11 changed files
--- a/googletest/test/gtest_xml_test_utils.py
+++ b/googletest/test/gtest_xml_test_utils.py
--- a/googletest/test/production.cc
+++ b/googletest/test/production.cc
--- a/googletest/test/production.h
+++ b/googletest/test/production.h
--- a/googletest/xcode/Config/DebugProject.xcconfig
+++ b/googletest/xcode/Config/DebugProject.xcconfig
--- 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
--- a/googletest/xcode/Scripts/versiongenerate.py
+++ b/googletest/xcode/Scripts/versiongenerate.py
--- a/googletest/xcode/gtest.xcodeproj/project.pbxproj
+++ b/googletest/xcode/gtest.xcodeproj/project.pbxproj
--- a/travis.sh
+++ b/travis.sh