Merge branch 'master' into fix-1764_CMake-errors-in-googlemock
ebb2fca51a2b
Actions

Authored by Gennadiy Civil <gennadiycivil@users.noreply.github.com> on Aug 27 2018, 19:25.

Description

Merge branch 'master' into fix-1764_CMake-errors-in-googlemock

Committed

GitHub <noreply@github.com>

Aug 27 2018, 19:25

Pushed

• trottet

Dec 4 2019, 13:52

Parents

Branches

Unknown

Tags

Unknown

GitHub <noreply@github.com> committed R9484:ebb2fca51a2b: Merge branch 'master' into fix-1764_CMake-errors-in-googlemock (authored by Gennadiy Civil <gennadiycivil@users.noreply.github.com>).Aug 27 2018, 19:25

Commit	Author	Details	Committed
641e7a3752d4	Gennadiy Civil/GitHub	Update CONTRIBUTING.md	Aug 27 2018
603ce4b81df4	David Schuldenfrei/Gennadiy Civil	Merge 72a2836945e7a3dcee0730166704587e10bf64ee into…	Aug 27 2018
a0e62d9f1a5f	Abseil Team/Gennadiy Civil	No longer require a functor passed to ResultOf matcher to define `result_of`…	Aug 27 2018

				Path
	M			CONTRIBUTING.md
	M			googlemock/include/gmock/gmock-matchers.h
	M			googlemock/test/gmock-matchers_test.cc
	M			googletest/src/gtest.cc
	A			googletest/test/gtest_list_output_unittest.py
	P			googletest/test/gtest_list_output_unittest_.cc Copied from googletest/test/googletest-param-test-invalid-name1-test_.cc
	M			googletest/test/gtest_unittest.cc