Merge pull request #1378 from gennadiycivil/master
be6ee26a9b5b
Actions

Authored by Gennadiy Civil <gennadiycivil@users.noreply.github.com> on Jan 4 2018, 18:17.

Description

Merge pull request #1378 from gennadiycivil/master

upstreaming cl 124976692

Committed

GitHub <noreply@github.com>

Jan 4 2018, 18:17

Pushed

• trottet

Dec 4 2019, 13:52

Parents

Branches

Unknown

Tags

Unknown

GitHub <noreply@github.com> committed R9484:be6ee26a9b5b: Merge pull request #1378 from gennadiycivil/master (authored by Gennadiy Civil <gennadiycivil@users.noreply.github.com>).Jan 4 2018, 18:17

	Commit			Author	Details	Committed
	4216f869f77b			Gennadiy Civil/GitHub	Merge branch 'master' into master	Jan 4 2018
	1c09831acc69			Gennadiy Civil	upstreaming cl 124976692	Jan 3 2018

				Path
	M			googlemock/test/gmock-internal-utils_test.cc
	M			googletest/src/gtest-death-test.cc
	M			googletest/src/gtest-internal-inl.h
	M			googletest/src/gtest-port.cc
	M			googletest/src/gtest-test-part.cc
	M			googletest/src/gtest.cc
	M			googletest/test/gtest-death-test_test.cc
	M			googletest/test/gtest-filepath_test.cc
	M			googletest/test/gtest-options_test.cc
	M			googletest/test/gtest-param-test_test.cc
	M			googletest/test/gtest-port_test.cc
	M			googletest/test/gtest_color_test_.cc
	M			googletest/test/gtest_env_var_test_.cc
	M			googletest/test/gtest_environment_test.cc
	M			googletest/test/gtest_output_test_.cc
	M			googletest/test/gtest_repeat_test.cc
	M			googletest/test/gtest_stress_test.cc
	M			googletest/test/gtest_unittest.cc