Merge remote-tracking branch 'google/master'

ecf94595 · Billy Donahue · c8044924 · bf5753ac · ecf94595 · ecf94595
Commit ecf94595 authored Aug 26, 2015 by Billy Donahue
20 changed files
--- a/test/gtest_color_test_.cc
+++ b/test/gtest_color_test_.cc
--- a/test/gtest_env_var_test.py
+++ b/test/gtest_env_var_test.py
--- a/test/gtest_env_var_test_.cc
+++ b/test/gtest_env_var_test_.cc
--- a/test/gtest_environment_test.cc
+++ b/test/gtest_environment_test.cc
--- a/test/gtest_filter_unittest.py
+++ b/test/gtest_filter_unittest.py
--- a/test/gtest_filter_unittest_.cc
+++ b/test/gtest_filter_unittest_.cc
--- a/test/gtest_help_test.py
+++ b/test/gtest_help_test.py
--- a/test/gtest_help_test_.cc
+++ b/test/gtest_help_test_.cc
--- a/test/gtest_list_tests_unittest.py
+++ b/test/gtest_list_tests_unittest.py
--- a/test/gtest_list_tests_unittest_.cc
+++ b/test/gtest_list_tests_unittest_.cc
--- a/test/gtest_main_unittest.cc
+++ b/test/gtest_main_unittest.cc
--- a/test/gtest_no_test_unittest.cc
+++ b/test/gtest_no_test_unittest.cc
--- a/test/gtest_output_test.py
+++ b/test/gtest_output_test.py
--- a/test/gtest_output_test_.cc
+++ b/test/gtest_output_test_.cc
--- a/test/gtest_output_test_golden_lin.txt
+++ b/test/gtest_output_test_golden_lin.txt
--- a/test/gtest_pred_impl_unittest.cc
+++ b/test/gtest_pred_impl_unittest.cc
--- a/test/gtest_premature_exit_test.cc
+++ b/test/gtest_premature_exit_test.cc
--- a/test/gtest_prod_test.cc
+++ b/test/gtest_prod_test.cc
--- a/test/gtest_repeat_test.cc
+++ b/test/gtest_repeat_test.cc
--- a/test/gtest_shuffle_test.py
+++ b/test/gtest_shuffle_test.py