Merge branch 'master' into master

24696c39 · Che-Hsun Liu · GitHub · 509f7fe8 · 673c975a · 24696c39
Commit 24696c39 authored Aug 14, 2017 by Che-Hsun Liu Committed by GitHub Aug 14, 2017
5 changed files
--- 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