Merge branch 'master' into variant_matcher
576d689c19f0
Actions

Authored by Xiaoyi Zhang <zhangxy988@gmail.com> on Feb 27 2018, 22:03.

Description

Merge branch 'master' into variant_matcher

Committed

GitHub <noreply@github.com>

Feb 27 2018, 22:03

Pushed

• trottet

Dec 4 2019, 13:52

Parents

Branches

Unknown

Tags

Unknown

GitHub <noreply@github.com> committed R9484:576d689c19f0: Merge branch 'master' into variant_matcher (authored by Xiaoyi Zhang <zhangxy988@gmail.com>).Feb 27 2018, 22:03

Commit	Author	Details	Committed
a9f2368dc07c	Gennadiy Civil/GitHub	Merge pull request #1483 from gennadiycivil/master	Feb 27 2018
ba40fd145695	Gennadiy Civil/GitHub	Merge branch 'master' into master	Feb 27 2018
ce61dc54a20f	Gennadiy Civil/GitHub	Merge pull request #1423 from pcc/win-libcxx2	Feb 27 2018
2bd1750ba7bd	Gennadiy Civil	gmock merging -2	Feb 27 2018
d4f77c1e3a34	Gennadiy Civil/GitHub	Merge branch 'master' into win-libcxx2	Feb 27 2018
3498a1ac52de	Peter Collingbourne	Use _CPPUNWIND instead of _HAS_EXCEPTIONS with MSVC.	Jan 25 2018
f9155307911e	Peter Collingbourne	Pass -EHs-c- to disable exceptions with MSVC.	Jan 25 2018

				Path
	M			googlemock/include/gmock/gmock-matchers.h
	M			googlemock/src/gmock-matchers.cc
	M			googlemock/test/gmock_link_test.h
	M			googletest/cmake/internal_utils.cmake
	M			googletest/include/gtest/internal/gtest-port.h