Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116

1cd979a8 · Tanzinul Islam · 32800999 · e5e2ef7c · 1cd979a8 · 1cd979a8
Commit 1cd979a8 authored Aug 01, 2018 by Tanzinul Islam
15 changed files
--- a/googletest/test/gtest_help_test.py
+++ b/googletest/test/gtest_help_test.py
--- a/googletest/test/gtest_output_test.py
+++ b/googletest/test/gtest_output_test.py
--- a/googletest/test/gtest_output_test_golden_lin.txt
+++ b/googletest/test/gtest_output_test_golden_lin.txt
--- a/googletest/test/gtest_prod_test.cc
+++ b/googletest/test/gtest_prod_test.cc
--- a/googletest/test/gtest_test_macro_stack_footprint_test.cc
+++ b/googletest/test/gtest_test_macro_stack_footprint_test.cc
--- a/googletest/test/gtest_test_utils.py
+++ b/googletest/test/gtest_test_utils.py
--- a/googletest/test/gtest_testbridge_test.py
+++ b/googletest/test/gtest_testbridge_test.py
--- a/googletest/test/gtest_testbridge_test_.cc
+++ b/googletest/test/gtest_testbridge_test_.cc
--- a/googletest/test/gtest_unittest.cc
+++ b/googletest/test/gtest_unittest.cc
--- a/googletest/test/gtest_xml_output_unittest.py
+++ b/googletest/test/gtest_xml_output_unittest.py
--- 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