Merge pull request #1429 from gennadiycivil/master
718fd88d8f14
Actions

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

Description

Merge pull request #1429 from gennadiycivil/master

Code merges

Committed

GitHub <noreply@github.com>

Jan 26 2018, 18:22

Pushed

• trottet

Dec 4 2019, 13:52

Parents

Branches

Unknown

Tags

Unknown

GitHub <noreply@github.com> committed R9484:718fd88d8f14: Merge pull request #1429 from gennadiycivil/master (authored by Gennadiy Civil <gennadiycivil@users.noreply.github.com>).Jan 26 2018, 18:22

	Commit			Author	Details	Committed
	92c93802e13e			Gennadiy Civil	Merge branch 'master' of https://github.com/google/googletest	Jan 26 2018
	fbb48a7708fc			Gennadiy Civil	Code merges	Jan 26 2018

				Path
	M			googlemock/include/gmock/gmock-matchers.h
	M			googlemock/include/gmock/gmock-more-matchers.h
	M			googlemock/include/gmock/gmock-spec-builders.h
	M			googlemock/include/gmock/gmock.h
	M			googlemock/include/gmock/internal/gmock-generated-internal-utils.h
	M			googlemock/include/gmock/internal/gmock-internal-utils.h
	M			googlemock/include/gmock/internal/gmock-port.h
	M			googlemock/test/gmock_stress_test.cc
	M			googlemock/test/gmock_test.cc