Merge branch 'master' into fix-printers
8dd1eb5984fb
Actions

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

Description

Merge branch 'master' into fix-printers

Committed

GitHub <noreply@github.com>

Feb 15 2018, 21:41

Pushed

• trottet

Dec 4 2019, 13:52

Parents

Branches

Unknown

Tags

Unknown

GitHub <noreply@github.com> committed R9484:8dd1eb5984fb: Merge branch 'master' into fix-printers (authored by Gennadiy Civil <gennadiycivil@users.noreply.github.com>).Feb 15 2018, 21:41

Commit	Author	Details	Committed
42140509b6fc	Gennadiy Civil/GitHub	Merge pull request #1459 from gennadiycivil/master	Feb 13 2018
8248169287b9	Gennadiy Civil	Merge branch 'master' of https://github.com/google/googletest	Feb 13 2018
a3e322b24f9a	Gennadiy Civil	cleanup, merges	Feb 13 2018
0d6a674f6102	Gennadiy Civil/GitHub	Merge pull request #1458 from gennadiycivil/master	Feb 13 2018
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/include/gtest/internal/gtest-filepath.h
	M			googletest/include/gtest/internal/gtest-internal.h
	M			googletest/include/gtest/internal/gtest-port.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