Merge pull request #1458 from gennadiycivil/master
0d6a674f6102
Actions

Authored by Gennadiy Civil <gennadiycivil@users.noreply.github.com> on Feb 13 2018, 21:24.

Description

Merge pull request #1458 from gennadiycivil/master

cleanup, merges

Committed

GitHub <noreply@github.com>

Feb 13 2018, 21:24

Pushed

• trottet

Dec 4 2019, 13:52

Parents

Branches

Unknown

Tags

Unknown

GitHub <noreply@github.com> committed R9484:0d6a674f6102: Merge pull request #1458 from gennadiycivil/master (authored by Gennadiy Civil <gennadiycivil@users.noreply.github.com>).Feb 13 2018, 21:24

	Commit			Author	Details	Committed
	68e4f076e5e1			Gennadiy Civil	Merge branch 'master' of https://github.com/google/googletest	Feb 13 2018
	09581b38523a			Gennadiy Civil	cleanup/merges	Feb 13 2018

				Path
	M			googletest/include/gtest/gtest-printers.h
	M			googletest/include/gtest/gtest_prod.h
	M			googletest/src/gtest-internal-inl.h
	M			googletest/src/gtest-port.cc
	M			googletest/src/gtest-typed-test.cc
	M			googletest/src/gtest.cc
	M			googletest/test/gtest_env_var_test_.cc
	M			googletest/test/gtest_main_unittest.cc
	M			googletest/test/gtest_uninitialized_test_.cc