Merge pull request #1397 from gennadiycivil/master
cac5d7ce1a50
Actions

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

Description

Merge pull request #1397 from gennadiycivil/master

Code Merge, upsteam of accumulated changes, cleanup

Committed

GitHub <noreply@github.com>

Jan 10 2018, 22:09

Pushed

• trottet

Dec 4 2019, 13:52

Parents

Branches

Unknown

Tags

Unknown

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

	Commit			Author	Details	Committed
	84aa45941fdf			Gennadiy Civil	Merge branch 'master' of https://github.com/google/googletest	Jan 10 2018
	6a26e47cfcc1			Gennadiy Civil	Code merge, upstreaming accumulated changes, cleanup	Jan 10 2018

				Path
	M			googletest/include/gtest/gtest-param-test.h
	M			googletest/include/gtest/gtest-param-test.h.pump
	M			googletest/include/gtest/gtest-typed-test.h
	M			googletest/include/gtest/internal/gtest-param-util-generated.h
	M			googletest/include/gtest/internal/gtest-param-util-generated.h.pump