Merge branch 'master' into wrong-version-reported

96f7ba83 · Gennadiy Civil · GitHub · b74070cf · 675686a1 · 96f7ba83
Commit 96f7ba83 authored Aug 21, 2017 by Gennadiy Civil Committed by GitHub Aug 21, 2017
18 changed files
--- a/googletest/samples/sample8_unittest.cc
+++ b/googletest/samples/sample8_unittest.cc
--- a/googletest/samples/sample9_unittest.cc
+++ b/googletest/samples/sample9_unittest.cc
--- a/googletest/scripts/upload.py
+++ b/googletest/scripts/upload.py
--- a/googletest/src/gtest-death-test.cc
+++ b/googletest/src/gtest-death-test.cc
--- a/googletest/src/gtest-internal-inl.h
+++ b/googletest/src/gtest-internal-inl.h
--- a/googletest/src/gtest-port.cc
+++ b/googletest/src/gtest-port.cc
--- a/googletest/src/gtest.cc
+++ b/googletest/src/gtest.cc
--- a/googletest/test/BUILD.bazel
+++ b/googletest/test/BUILD.bazel
--- a/googletest/test/gtest-death-test_test.cc
+++ b/googletest/test/gtest-death-test_test.cc
--- a/googletest/test/gtest-port_test.cc
+++ b/googletest/test/gtest-port_test.cc
--- a/googletest/test/gtest-printers_test.cc
+++ b/googletest/test/gtest-printers_test.cc
--- a/googletest/test/gtest_catch_exceptions_test_.cc
+++ b/googletest/test/gtest_catch_exceptions_test_.cc
--- a/googletest/test/gtest_test_utils.py
+++ b/googletest/test/gtest_test_utils.py
--- a/googletest/test/gtest_unittest.cc
+++ b/googletest/test/gtest_unittest.cc
--- a/googletest/test/gtest_xml_outfiles_test.py
+++ b/googletest/test/gtest_xml_outfiles_test.py
--- a/googletest/test/gtest_xml_output_unittest.py
+++ b/googletest/test/gtest_xml_output_unittest.py
--- 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