Merge branch 'master' into cleanup-cmake
4b6a7a49ab63
Actions

Authored by Henry Schreiner <henryschreineriii@utexas.edu> on Apr 6 2018, 21:52.

Description

Merge branch 'master' into cleanup-cmake

Committed

GitHub <noreply@github.com>

Apr 6 2018, 21:52

Pushed

• trottet

Dec 4 2019, 13:52

Parents

Branches

Unknown

Tags

Unknown

GitHub <noreply@github.com> committed R9484:4b6a7a49ab63: Merge branch 'master' into cleanup-cmake (authored by Henry Schreiner <henryschreineriii@utexas.edu>).Apr 6 2018, 21:52

Commit	Author	Details	Committed
82febb8eafc0	Gennadiy Civil/GitHub	Merge pull request #1549 from gennadiycivil/master	Apr 5 2018
bee1d13fcc71	Gennadiy Civil	Merge branch 'master' of github.com:google/googletest	Apr 5 2018
fe402c27790f	Gennadiy Civil	Merging gMock, 2	Apr 5 2018
d0905653ed34	Gennadiy Civil/GitHub	Merge pull request #1547 from gennadiycivil/master	Apr 5 2018
7e5f90d3780d	Gennadiy Civil	formatting	Apr 5 2018
928636135b28	Gennadiy Civil	And more MCVS warnings	Apr 5 2018
e0f4cf05614a	Gennadiy Civil	fixing MCVS warn	Apr 5 2018
7045138a0d4f	Gennadiy Civil	Have to wait for this one	Apr 5 2018
66eaf9f0eb89	Gennadiy Civil	Have to wait for this one	Apr 5 2018
af93d59eb7b3	Gennadiy Civil	Merging matchers test	Apr 5 2018
47d15bceea62	Gennadiy Civil	Merge branch 'master' of github.com:google/googletest	Apr 5 2018
0cd6a4f5f585	Gennadiy Civil	Merging matchers test	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-more-matchers.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-matchers_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