Diffusion sp4e-homework-lars-bertil f8fbe1c82175

Merge branch 'master' into unsigned-wchar
f8fbe1c82175
Actions

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

Description

Merge branch 'master' into unsigned-wchar

Details

Committed

GitHub <noreply@github.com>

Mar 1 2018, 17:18

Pushed

• trottet

Dec 4 2019, 13:52

Parents

R9484:837c24637040: Merge branch 'master' into unsigned-wchar
R9484:447d58b4ee8e: Merge pull request #1485 from coryan/parallelize-appveyor

Branches

Unknown

Tags

Unknown

Event Timeline

GitHub <noreply@github.com> committed R9484:f8fbe1c82175: Merge branch 'master' into unsigned-wchar (authored by Gennadiy Civil <gennadiycivil@users.noreply.github.com>).Mar 1 2018, 17:18

Merged Changes

Commit	Author	Details	Committed
447d58b4ee8e	Gennadiy Civil/GitHub	Merge pull request #1485 from coryan/parallelize-appveyor	Feb 28 2018
18d270e335c4	Gennadiy Civil/GitHub	Merge pull request #1479 from petrhosek/json	Feb 28 2018
3817871beb53	Gennadiy Civil/GitHub	Merge branch 'master' into json	Feb 28 2018
3431b6990980	Carlos O'Ryan	Add options to parallelize builds.	Feb 28 2018
9557d29b7a5f	Gennadiy Civil/GitHub	Merge pull request #1481 from dneto0/debug-postfix	Feb 28 2018
66d71756a72a	Gennadiy Civil/GitHub	Merge branch 'master' into debug-postfix	Feb 28 2018
6baf17e9d111	Petr Hosek	Support JSON output format in addition to XML	Feb 28 2018
fe1144246e7e	Gennadiy Civil/GitHub	Merge pull request #1482 from zhangxy988/variant_matcher	Feb 27 2018
e1622337aebe	Xiaoyi Zhang	Merge branch 'variant_matcher' of https://github.com/zhangxy988/googletest into…	Feb 27 2018
576d689c19f0	Xiaoyi Zhang/GitHub	Merge branch 'master' into variant_matcher	Feb 27 2018
62be6f34d175	Xiaoyi Zhang	Merge branch 'variant_matcher' of https://github.com/zhangxy988/googletest into…	Feb 27 2018
2eb31c185cfd	Xiaoyi Zhang	Add documentation for VariantWith.	Feb 27 2018
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
ab46d9550bba	Gennadiy Civil/GitHub	Merge branch 'master' into debug-postfix	Feb 27 2018
b951c652ff8b	Gennadiy Civil/GitHub	Merge branch 'master' into variant_matcher	Feb 27 2018
190e2cdd0b55	Xiaoyi Zhang	Add matcher for std::variant.	Feb 27 2018
d4f77c1e3a34	Gennadiy Civil/GitHub	Merge branch 'master' into win-libcxx2	Feb 27 2018
20074be19a9c	David Neto	Use DEBUG_POSTFIX instead of CMAKE_DEBUG_POSTFIX	Feb 26 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

Changes (14)

				Path
	M			appveyor.yml
	M			googlemock/docs/CheatSheet.md
	M			googlemock/include/gmock/gmock-matchers.h
	M			googlemock/src/gmock-matchers.cc
	M			googlemock/test/gmock-matchers_test.cc
	M			googlemock/test/gmock_link_test.h
	M			googletest/CMakeLists.txt
	M			googletest/cmake/internal_utils.cmake
	M			googletest/docs/AdvancedGuide.md
	M			googletest/include/gtest/internal/gtest-port.h
	M			googletest/src/gtest.cc
	P			googletest/test/gtest_json_outfiles_test.py Copied from googletest/test/gtest_xml_outfiles_test.py
	A			googletest/test/gtest_json_output_unittest.py
	P			googletest/test/gtest_json_test_utils.py Copied from googletest/xcode/Samples/FrameworkSample/runtests.sh