Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS
ceee80c383d6
Actions

Authored by Herbert Thielen <thielen@hs-worms.de> on Oct 4 2017, 21:03.

Description

Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS

Committed

GitHub <noreply@github.com>

Oct 4 2017, 21:03

Pushed

• trottet

Dec 4 2019, 13:52

Parents

Branches

Unknown

Tags

Unknown

	Commit			Author	Details	Committed
	7b6561c56e35			Gennadiy Civil/GitHub	Merge pull request #1275 from jwakely/pr/1273	Oct 3 2017
	b70cf1a663ad			Jonathan Wakely	Use gender-neutral pronouns in comments and docs	Sep 27 2017

				Path
	M			googlemock/docs/CookBook.md
	M			googlemock/docs/FrequentlyAskedQuestions.md
	M			googlemock/include/gmock/gmock-spec-builders.h
	M			googlemock/src/gmock-internal-utils.cc
	M			googlemock/src/gmock-spec-builders.cc
	M			googlemock/test/gmock-cardinalities_test.cc
	M			googlemock/test/gmock-internal-utils_test.cc
	M			googlemock/test/gmock-spec-builders_test.cc
	M			googletest/docs/AdvancedGuide.md
	M			googletest/docs/FAQ.md
	M			googletest/include/gtest/internal/gtest-port.h
	M			googletest/src/gtest.cc
	M			googletest/test/gtest-death-test_test.cc
	M			googletest/test/gtest-filepath_test.cc
	M			googletest/test/gtest-options_test.cc
	M			googletest/test/gtest-port_test.cc
	M			googletest/test/gtest_color_test_.cc
	M			googletest/test/gtest_output_test_.cc
	M			googletest/test/gtest_repeat_test.cc
	M			googletest/test/gtest_unittest.cc