Merge branch 'master' into josh/fix_scoped_class2

3e2cb754 · Josh Bodily · GitHub · cf85f56b · 0fe96607 · 3e2cb754
Unverified Commit 3e2cb754 authored Dec 12, 2017 by Josh Bodily Committed by GitHub Dec 12, 2017
6 changed files
--- a/googletest/test/gtest_output_test_.cc
+++ b/googletest/test/gtest_output_test_.cc
--- a/googletest/test/gtest_output_test_golden_lin.txt
+++ b/googletest/test/gtest_output_test_golden_lin.txt
--- a/googletest/test/gtest_repeat_test.cc
+++ b/googletest/test/gtest_repeat_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/travis.sh
+++ b/travis.sh