Merge branch 'master' into hethi/typo-xUnit
30c1e00afbc0
Actions

Authored by Gennadiy Civil <gennadiycivil@users.noreply.github.com> on Aug 29 2017, 16:19.

Description

Merge branch 'master' into hethi/typo-xUnit

Committed

GitHub <noreply@github.com>

Aug 29 2017, 16:19

Pushed

• trottet

Dec 4 2019, 13:52

Parents

Branches

Unknown

Tags

Unknown

GitHub <noreply@github.com> committed R9484:30c1e00afbc0: Merge branch 'master' into hethi/typo-xUnit (authored by Gennadiy Civil <gennadiycivil@users.noreply.github.com>).Aug 29 2017, 16:19

Commit	Author	Details	Committed
96f3745e73d5	Gennadiy Civil/GitHub	Merge pull request #1189 from alyssawilk/flag-default	Aug 29 2017
fa5d3b3845aa	Alyssa Wilk	Applying lint checks from upstream google3	Aug 28 2017
c00373320db8	Alyssa Wilk	Merge branch 'refs/heads/master' into flag-default	Aug 28 2017
a2803bc37daf	Alyssa Wilk	Handling invalid flag values	Aug 16 2017
6e1970e2376c	Alyssa Wilk	Adding a flag option to change the default mock type	Aug 10 2017

				Path
	M			googlemock/include/gmock/gmock-spec-builders.h
	M			googlemock/include/gmock/gmock.h
	M			googlemock/src/gmock-spec-builders.cc
	M			googlemock/src/gmock.cc
	M			googlemock/test/gmock-spec-builders_test.cc
	M			googlemock/test/gmock_test.cc