Diffusion sp4e-homework-lars-bertil f11a8f913158

Merge branch 'master' into fix-argc
f11a8f913158
Actions

Authored by Conor Burgess <Burgess.Conor@gmail.com> on Feb 12 2018, 18:35.

Description

Merge branch 'master' into fix-argc

Details

Committed

GitHub <noreply@github.com>

Feb 12 2018, 18:35

Pushed

• trottet

Dec 4 2019, 13:52

Parents

R9484:27bb844e5c31: Merge branch 'master' into fix-argc
R9484:15392f1a38fa: Merge pull request #1449 from gennadiycivil/master

Branches

Unknown

Tags

Unknown

Event Timeline

GitHub <noreply@github.com> committed R9484:f11a8f913158: Merge branch 'master' into fix-argc (authored by Conor Burgess <Burgess.Conor@gmail.com>).Feb 12 2018, 18:35

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

Commit	Author	Details	Committed
15392f1a38fa	Gennadiy Civil/GitHub	Merge pull request #1449 from gennadiycivil/master	Feb 10 2018
575c08122741	Gennadiy Civil	merging	Feb 9 2018
49fc378e0a4f	Gennadiy Civil	merges	Feb 9 2018
9737e63c69e9	Gennadiy Civil/GitHub	Merge pull request #1439 from DarthGandalf/assert	Feb 9 2018
b324a36c35c1	Gennadiy Civil/GitHub	Merge branch 'master' into assert	Feb 9 2018
22a115055a34	Gennadiy Civil/GitHub	Merge pull request #1446 from tholsapp/master	Feb 9 2018
c211f21906ca	Gennadiy Civil/GitHub	Merge pull request #1448 from gennadiycivil/master	Feb 9 2018
ec7faa943d78	Gennadiy Civil	merges	Feb 9 2018
c8510504ddf3	Troy Holsapple	Fixed typos	Feb 8 2018
092d08853323	Alexey Sokolov	Add ability to throw from ASSERT	Feb 8 2018
a3c73ed28d79	Gennadiy Civil/GitHub	Include MSVC14 on PRs as well	Feb 6 2018
ea31cb15f0c2	Gennadiy Civil/GitHub	Merge pull request #1435 from gennadiycivil/master	Jan 31 2018
e6ec8bc52f74	Gennadiy Civil	Merges and also adding new bazel build mode	Jan 31 2018
e55fded0c882	Gennadiy Civil	Code merges	Jan 30 2018
a1923a59d589	Gennadiy Civil/GitHub	Merge pull request #1434 from gennadiycivil/master	Jan 30 2018
2a4683021ab3	Gennadiy Civil	Ability to optionally depend on Abseil plus upstream of 183716547	Jan 30 2018
798cc4a78a51	Gennadiy Civil/GitHub	Merge pull request #1430 from gennadiycivil/master	Jan 29 2018
6c0c389601fc	Gennadiy Civil	Adding tests to googlemock bazel	Jan 26 2018
718fd88d8f14	Gennadiy Civil/GitHub	Merge pull request #1429 from gennadiycivil/master	Jan 26 2018
92c93802e13e	Gennadiy Civil	Merge branch 'master' of https://github.com/google/googletest	Jan 26 2018
fbb48a7708fc	Gennadiy Civil	Code merges	Jan 26 2018
cb7271697bca	Gennadiy Civil/GitHub	Merge pull request #1428 from lidaobing/patch-2	Jan 26 2018
aa82c6f14b72	Gennadiy Civil/GitHub	Merge pull request #1426 from stefanosoffia/fix_test_build_gcc7_2_0	Jan 26 2018
efd49c2d456b	LI Daobing/GitHub	Update Documentation.md	Jan 26 2018
b8ac390a577e	Stefano Soffia	Fix test build issue with GCC7.2.	Jan 25 2018
b3a2048beb0f	Gennadiy Civil/GitHub	Update README.md	Jan 25 2018
7cced896a08f	Gennadiy Civil/GitHub	Remove Visual Studio 10,11,12 from build matrix	Jan 25 2018
46ab9ecf1f86	Gennadiy Civil/GitHub	Merge pull request #1421 from gennadiycivil/master	Jan 24 2018
b9651c04ef7b	Gennadiy Civil	placating gcc and its overzeauls size comparison warnings	Jan 24 2018
264ba3e68e94	Gennadiy Civil	Merge branch 'master' of https://github.com/google/googletest	Jan 24 2018
21cf8360036d	Gennadiy Civil/GitHub	Merge pull request #1418 from gennadiycivil/master	Jan 24 2018
e29805aa5d23	Gennadiy Civil	upstream cl 182543808	Jan 24 2018
7a2563a51456	Gennadiy Civil	Merge branch 'master' of https://github.com/google/googletest	Jan 24 2018
06c3cce86709	Gennadiy Civil	revert, lets get this compiled	Jan 24 2018
ab9c44ccf0f7	Gennadiy Civil/GitHub	Merge pull request #1410 from pcc/win-libcxx	Jan 24 2018
80defcec57ce	Gennadiy Civil	Many code merge/upstream changes	Jan 23 2018
ad0146bfe21e	Gennadiy Civil/GitHub	Merge branch 'master' into win-libcxx	Jan 23 2018
3c5e064ca089	Gennadiy Civil/GitHub	Merge pull request #1417 from gennadiycivil/master	Jan 23 2018
58df5760569f	Gennadiy Civil	Merge branch 'master' of https://github.com/google/googletest	Jan 23 2018
6723b6c588e2	Gennadiy Civil	Merging, upstream http://cl/182836545	Jan 23 2018
bbb17ad0f78c	Gennadiy Civil	more code merge	Jan 22 2018
f1c87ad9f518	Gennadiy Civil	merges, cl/155419551 and other	Jan 22 2018
83fa0cb17dad	Gennadiy Civil/GitHub	Merge pull request #1415 from gennadiycivil/master	Jan 22 2018
9bc86661f86a	Gennadiy Civil	more merging	Jan 22 2018
a0435a54ce83	Gennadiy Civil	merging	Jan 22 2018
8d707dfe817d	Gennadiy Civil	code merge	Jan 22 2018
62ba5d91d0ce	Gennadiy Civil/GitHub	Merge pull request #1401 from eidosmontreal/support_xboxone	Jan 19 2018
1489dc8daad3	Gennadiy Civil/GitHub	Merge branch 'master' into support_xboxone	Jan 18 2018
20b53ad786eb	Gennadiy Civil/GitHub	Merge branch 'master' into win-libcxx	Jan 18 2018
051053054df6	Gennadiy Civil/GitHub	Merge pull request #1412 from gennadiycivil/master	Jan 18 2018

Changes (66)

				Path
	M			BUILD.bazel
	M			README.md
	M			WORKSPACE
	M			appveyor.yml
	M			ci/build-linux-bazel.sh
	M			googlemock/CMakeLists.txt
	M			googlemock/docs/CookBook.md
	M			googlemock/include/gmock/gmock-matchers.h
	M			googlemock/include/gmock/gmock-more-matchers.h
	M			googlemock/include/gmock/gmock-spec-builders.h
	M			googlemock/include/gmock/gmock.h
	M			googlemock/include/gmock/internal/gmock-generated-internal-utils.h
	M			googlemock/include/gmock/internal/gmock-internal-utils.h
	M			googlemock/include/gmock/internal/gmock-port.h
	M			googlemock/scripts/generator/cpp/ast.py
	M			googlemock/test/BUILD.bazel
	M			googlemock/test/gmock-actions_test.cc
	M			googlemock/test/gmock-matchers_test.cc
	M			googlemock/test/gmock_output_test.py
	M			googlemock/test/gmock_stress_test.cc
	M			googlemock/test/gmock_test.cc
	M			googlemock/test/gmock_test_utils.py
	M			googletest/cmake/internal_utils.cmake
	M			googletest/docs/AdvancedGuide.md
	M			googletest/docs/Documentation.md
	M			googletest/docs/FAQ.md
	M			googletest/include/gtest/gtest-printers.h
	M			googletest/include/gtest/gtest.h
	M			googletest/include/gtest/gtest_pred_impl.h
	M			googletest/include/gtest/internal/gtest-filepath.h
	M			googletest/include/gtest/internal/gtest-internal.h
	M			googletest/include/gtest/internal/gtest-port-arch.h
	M			googletest/include/gtest/internal/gtest-port.h
	M			googletest/src/gtest-death-test.cc
	M			googletest/src/gtest-filepath.cc
	M			googletest/src/gtest-internal-inl.h
	M			googletest/src/gtest-printers.cc
	M			googletest/src/gtest.cc
	M			googletest/src/gtest_main.cc
	M			googletest/test/BUILD.bazel
	M			googletest/test/gtest-param-test2_test.cc
	M			googletest/test/gtest-printers_test.cc
	M			googletest/test/gtest-typed-test2_test.cc
	M			googletest/test/gtest-typed-test_test.cc
	P			googletest/test/gtest_assert_by_exception_test.cc Copied from googletest/test/gtest_throw_on_failure_ex_test.cc
	M			googletest/test/gtest_break_on_failure_unittest.py
	M			googletest/test/gtest_catch_exceptions_test.py
	M			googletest/test/gtest_color_test.py
	M			googletest/test/gtest_env_var_test.py
	M			googletest/test/gtest_filter_unittest.py
	M			googletest/test/gtest_list_tests_unittest.py
	M			googletest/test/gtest_output_test.py
	M			googletest/test/gtest_output_test_.cc
	M			googletest/test/gtest_output_test_golden_lin.txt
	M			googletest/test/gtest_pred_impl_unittest.cc
	M			googletest/test/gtest_prod_test.cc
	M			googletest/test/gtest_repeat_test.cc
	M			googletest/test/gtest_test_utils.py
	M			googletest/test/gtest_throw_on_failure_test.py
	M			googletest/test/gtest_uninitialized_test.py
	M			googletest/test/gtest_uninitialized_test_.cc
	M			googletest/test/gtest_unittest.cc
	M			googletest/test/gtest_xml_outfiles_test.py
	M			googletest/test/gtest_xml_output_unittest.py
	M			googletest/test/gtest_xml_test_utils.py
	M			googletest/xcode/Scripts/versiongenerate.py