Merge pull request #1549 from gennadiycivil/master
82febb8eafc0
Actions

Authored by Gennadiy Civil <gennadiycivil@users.noreply.github.com> on Apr 5 2018, 22:20.

Description

Merge pull request #1549 from gennadiycivil/master

Merging gMock, 2

Committed

GitHub <noreply@github.com>

Apr 5 2018, 22:20

Pushed

• trottet

Dec 4 2019, 13:52

Parents

Branches

Unknown

Tags

Unknown

GitHub <noreply@github.com> committed R9484:82febb8eafc0: Merge pull request #1549 from gennadiycivil/master (authored by Gennadiy Civil <gennadiycivil@users.noreply.github.com>).Apr 5 2018, 22:20

	Commit			Author	Details	Committed
	bee1d13fcc71			Gennadiy Civil	Merge branch 'master' of github.com:google/googletest	Apr 5 2018
	fe402c27790f			Gennadiy Civil	Merging gMock, 2	Apr 5 2018

				Path
	M			googlemock/include/gmock/gmock-generated-function-mockers.h
	M			googlemock/include/gmock/gmock-generated-function-mockers.h.pump
	M			googlemock/include/gmock/gmock-generated-nice-strict.h
	M			googlemock/include/gmock/gmock-spec-builders.h
	M			googlemock/src/gmock-spec-builders.cc
	M			googlemock/test/gmock-actions_test.cc
	M			googlemock/test/gmock-spec-builders_test.cc
	M			googlemock/test/gmock_output_test_.cc
	M			googlemock/test/gmock_output_test_golden.txt