Merge pull request #1512 from gennadiycivil/master
78579756a806
Actions

Authored by Gennadiy Civil <gennadiycivil@users.noreply.github.com> on Mar 26 2018, 17:19.

Description

Merge pull request #1512 from gennadiycivil/master

merges, gmock - 1

Committed

GitHub <noreply@github.com>

Mar 26 2018, 17:19

Pushed

• trottet

Dec 4 2019, 13:52

Parents

Branches

Unknown

Tags

Unknown

GitHub <noreply@github.com> committed R9484:78579756a806: Merge pull request #1512 from gennadiycivil/master (authored by Gennadiy Civil <gennadiycivil@users.noreply.github.com>).Mar 26 2018, 17:19

Commit	Author	Details	Committed
6aae206bc297	Gennadiy Civil	merging gmock-matchers.h 3	Mar 26 2018
23187058e761	Gennadiy Civil	merging gmock-matchers.h 2	Mar 26 2018
8ea10d38784a	Gennadiy Civil	Upstreaming FloatingEq2Matcher,	Mar 26 2018
b907c26740f5	Gennadiy Civil	Merging gmock-matchers.h -2	Mar 23 2018
466a49ae3051	Gennadiy Civil	gmock-matchers merging -2	Mar 23 2018
a28a7eb5e9be	Gennadiy Civil	Merge branch 'master' of https://github.com/google/googletest	Mar 22 2018
b7c568326c96	Gennadiy Civil	merging, gmock -1	Mar 22 2018

				Path
	M			googlemock/include/gmock/gmock-matchers.h
	M			googlemock/src/gmock-matchers.cc
	M			googlemock/test/gmock-internal-utils_test.cc
	M			googlemock/test/gmock_output_test_.cc