Merge pull request #1577 from gennadiycivil/master
4035d6ecc030
Actions

Authored by Gennadiy Civil <gennadiycivil@users.noreply.github.com> on Apr 18 2018, 01:44.

Description

Merge pull request #1577 from gennadiycivil/master

merging gmock generated matchers

Committed

GitHub <noreply@github.com>

Apr 18 2018, 01:44

Pushed

• trottet

Dec 4 2019, 13:52

Parents

Branches

Unknown

Tags

Unknown

GitHub <noreply@github.com> committed R9484:4035d6ecc030: Merge pull request #1577 from gennadiycivil/master (authored by Gennadiy Civil <gennadiycivil@users.noreply.github.com>).Apr 18 2018, 01:44

Commit	Author	Details	Committed
80d6e26a9c17	Gennadiy Civil	cl/193060888	Apr 18 2018
5dccf6b79eb5	Gennadiy Civil	http://cl/193060888	Apr 17 2018
dff32aff97a6	Gennadiy Civil	http://cl/193060888	Apr 17 2018
3f88bb1831e4	Gennadiy Civil	test-meerging	Apr 16 2018
ec425d71601d	Gennadiy Civil	typo	Apr 16 2018
e4ab316c85c1	Gennadiy Civil	more msvc	Apr 16 2018
1944bc0f510f	Gennadiy Civil	typo	Apr 16 2018
e9eff488f9a4	Gennadiy Civil	msvc warnings	Apr 16 2018
bd2a1aed03c8	Gennadiy Civil	merging gmock generated matchers	Apr 16 2018

				Path
	M			googlemock/include/gmock/gmock-generated-matchers.h
	M			googlemock/include/gmock/gmock-generated-matchers.h.pump
	M			googlemock/include/gmock/gmock-matchers.h
	M			googlemock/test/gmock-generated-matchers_test.cc
	M			googlemock/test/gmock-matchers_test.cc