Merge pull request #1418 from gennadiycivil/master
21cf8360036d
Actions

Authored by Gennadiy Civil <gennadiycivil@users.noreply.github.com> on Jan 24 2018, 20:57.

Description

Merge pull request #1418 from gennadiycivil/master

Many code merge/upstream changes

Committed

GitHub <noreply@github.com>

Jan 24 2018, 20:57

Pushed

• trottet

Dec 4 2019, 13:52

Parents

Branches

Unknown

Tags

Unknown

GitHub <noreply@github.com> committed R9484:21cf8360036d: Merge pull request #1418 from gennadiycivil/master (authored by Gennadiy Civil <gennadiycivil@users.noreply.github.com>).Jan 24 2018, 20:57

	Commit			Author	Details	Committed
	06c3cce86709			Gennadiy Civil	revert, lets get this compiled	Jan 24 2018
	80defcec57ce			Gennadiy Civil	Many code merge/upstream changes	Jan 23 2018

				Path
	M			googletest/src/gtest_main.cc
	M			googletest/test/gtest-param-test2_test.cc
	M			googletest/test/gtest-printers_test.cc
	M			googletest/test/gtest-typed-test2_test.cc
	M			googletest/test/gtest-typed-test_test.cc
	M			googletest/test/gtest_break_on_failure_unittest.py
	M			googletest/test/gtest_catch_exceptions_test.py
	M			googletest/test/gtest_color_test.py
	M			googletest/test/gtest_env_var_test.py
	M			googletest/test/gtest_list_tests_unittest.py
	M			googletest/test/gtest_output_test_.cc
	M			googletest/test/gtest_output_test_golden_lin.txt
	M			googletest/test/gtest_pred_impl_unittest.cc
	M			googletest/test/gtest_prod_test.cc
	M			googletest/test/gtest_xml_test_utils.py