Merge pull request #1394 from gennadiycivil/master
509e78be2388
Actions

Authored by Gennadiy Civil <gennadiycivil@users.noreply.github.com> on Jan 10 2018, 02:22.

Description

Merge pull request #1394 from gennadiycivil/master

wip, cleanups/merge

Committed

GitHub <noreply@github.com>

Jan 10 2018, 02:22

Pushed

• trottet

Dec 4 2019, 13:52

Parents

Branches

Unknown

Tags

Unknown

GitHub <noreply@github.com> committed R9484:509e78be2388: Merge pull request #1394 from gennadiycivil/master (authored by Gennadiy Civil <gennadiycivil@users.noreply.github.com>).Jan 10 2018, 02:22

Commit	Author	Details	Committed
2ad5661db2ac	Gennadiy Civil	Upstream of cl 129104714	Jan 9 2018
5eecadf67afb	Gennadiy Civil	Revert one file	Jan 9 2018
9fce984a6770	Gennadiy Civil	wip, cleanups/merge	Jan 9 2018

				Path
	D			googletest/build-aux
	D			googletest/build-aux/.keep
	M			googletest/include/gtest/gtest-death-test.h
	M			googletest/include/gtest/internal/gtest-death-test-internal.h
	M			googletest/include/gtest/internal/gtest-filepath.h