Merge branch 'master' into master
ba40fd145695
Actions

Authored by Gennadiy Civil <gennadiycivil@users.noreply.github.com> on Feb 27 2018, 20:10.

Description

Merge branch 'master' into master

Committed

GitHub <noreply@github.com>

Feb 27 2018, 20:10

Pushed

• trottet

Dec 4 2019, 13:52

Parents

Branches

Unknown

Tags

Unknown

GitHub <noreply@github.com> committed R9484:ba40fd145695: Merge branch 'master' into master (authored by Gennadiy Civil <gennadiycivil@users.noreply.github.com>).Feb 27 2018, 20:10

Commit	Author	Details	Committed
ce61dc54a20f	Gennadiy Civil/GitHub	Merge pull request #1423 from pcc/win-libcxx2	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			googletest/cmake/internal_utils.cmake
	M			googletest/include/gtest/internal/gtest-port.h