Diffusion sp4e-homework-lars-bertil 6de39826aa19

Merge branch 'master' into issue_1735
6de39826aa19
Actions

Authored by Jacob Schloss <jschloss@swiftengineering.com> on Aug 22 2018, 21:55.

Description

Merge branch 'master' into issue_1735

Details

Committed

GitHub <noreply@github.com>

Aug 22 2018, 21:55

Pushed

• trottet

Dec 4 2019, 13:52

Parents

R9484:1d9a1912e7f4: Merge pull request #1338 from stefanosoffia/master
R9484:6e7980164593: It seems like CMAKE_CXX_FLAGS is getting double appended when building as a…

Branches

Unknown

Tags

Unknown

Event Timeline

GitHub <noreply@github.com> committed R9484:6de39826aa19: Merge branch 'master' into issue_1735 (authored by Jacob Schloss <jschloss@swiftengineering.com>).Aug 22 2018, 21:55

Merged Changes

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

Commit	Author	Details	Committed
1d9a1912e7f4	Gennadiy Civil/GitHub	Merge pull request #1338 from stefanosoffia/master	Aug 22 2018
aff0379441a3	Stefano Soffia/Stefano Soffia	Install CMake export files	Aug 22 2018
880896c6f481	Gennadiy Civil/GitHub	Merge pull request #1682 from dakotahawkins/improve-exported-targets	Aug 21 2018
759ef7c4e966	Dakota Hawkins	Improve CMake exported targets.	Aug 21 2018
b88511ef640c	Gennadiy Civil/GitHub	Merge pull request #1194 from joshbodily/josh/fix_scoped_class2	Aug 21 2018
a6e7ba27c737	Gennadiy Civil/GitHub	Merge branch 'master' into josh/fix_scoped_class2	Aug 20 2018
735bd75f69f8	Gennadiy Civil/GitHub	Update CONTRIBUTING.md	Aug 20 2018
ecd844de9017	Gennadiy Civil/GitHub	Merge pull request #1759 from gennadiycivil/master	Aug 20 2018
6c8c74eceec0	Gennadiy Civil	merge	Aug 20 2018
df428ec11891	misterg/Gennadiy Civil	googletest export	Aug 20 2018
5891bb530736	misterg/Gennadiy Civil	googletest export	Aug 20 2018
cfc0d5fb0c59	Gennadiy Civil	Testing, adding a few line to sample4	Aug 20 2018
72a810596642	Gennadiy Civil	Testing, adding to sample4 unittest	Aug 20 2018
9404c5ae0431	Gennadiy Civil/GitHub	Merge pull request #1754 from vkotovv/docs-advanced-broken-links	Aug 20 2018
49e6a9b771c2	Gennadiy Civil/GitHub	Merge pull request #1120 from tanzislam/fix_death_test_child_mingw_wer_issue1116	Aug 20 2018
c1230dea6b8a	Gennadiy Civil/GitHub	Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116	Aug 20 2018
ddc618ab31c8	Vadim Kotov/GitHub	docs: fix more broken links to sections in Advanced guide	Aug 20 2018
02c4f1af9d3c	Vadim Kotov/GitHub	docs: fixed broken references to sections in Advanced guide	Aug 20 2018
1778f2091e90	Gennadiy Civil/GitHub	Merge pull request #1347 from Burgch/fix-argc	Aug 19 2018
97274b1e9488	Gennadiy Civil/GitHub	Merge branch 'master' into fix-argc	Aug 19 2018
a946f7db03fb	Gennadiy Civil/GitHub	Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116	Aug 18 2018
d1c1aac78160	Gennadiy Civil/GitHub	Merge pull request #1612 from wkaluza/fix-msvc-d9025-warning	Aug 18 2018
85b572394b53	Gennadiy Civil/GitHub	Merge pull request #1652 from medithe/patch-1	Aug 18 2018
cb69e686df17	Tanzinul Islam	Merge branch 'fix_death_test_child_mingw_wer_issue1116' of https://github.	Aug 18 2018
9d77e63e125a	Tanzinul Islam	Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116	Aug 18 2018
2a380bc26db8	Gennadiy Civil/GitHub	Merge branch 'master' into patch-1	Aug 17 2018
e82d320567a4	Gennadiy Civil/GitHub	Merge pull request #1748 from laixer/std	Aug 17 2018
079641531492	Vadim Berezniker	std references shouldn't be fully qualified	Aug 17 2018
cda442da0b60	Gennadiy Civil/GitHub	Formatting	Aug 17 2018
edc1bc606eb4	Gennadiy Civil/GitHub	Merge branch 'master' into patch-1	Aug 17 2018
88cd66513c64	Gennadiy Civil/GitHub	Minor formatting/style changes	Aug 17 2018
687964c84f79	Conor Burgess/GitHub	Merge branch 'master' into fix-argc	Aug 17 2018
a9bd428e72a1	Gennadiy Civil/GitHub	Merge branch 'master' into fix-msvc-d9025-warning	Aug 17 2018
02a8ca877356	Gennadiy Civil/GitHub	Merge pull request #1546 from henryiii/cleanup-cmake	Aug 17 2018
a65a993a3c00	Henry Schreiner/GitHub	Merge branch 'master' into cleanup-cmake	Aug 17 2018
f87798a3f7c7	Gennadiy Civil/GitHub	Merge pull request #1646 from tisi1988/master	Aug 16 2018
d20fa182a60c	Gennadiy Civil/GitHub	was not quite right,	Aug 16 2018
b1bfdf0bf48b	Gennadiy Civil/GitHub	Small formatting change	Aug 16 2018
8c86040dd672	Gennadiy Civil/GitHub	Merge branch 'master' into master	Aug 16 2018
8b34930c62c2	Gennadiy Civil/GitHub	Merge pull request #1142 from scottslacksmith/master	Aug 16 2018
c38f4b9f2c54	Gennadiy Civil/GitHub	Small style changes.	Aug 16 2018
21e518557ad7	Gennadiy Civil/GitHub	Merge branch 'master' into josh/fix_scoped_class2	Aug 16 2018
f3a9fa6a62a2	Gennadiy Civil/GitHub	Merge branch 'master' into master	Aug 16 2018
1dad4cf52123	Gennadiy Civil/GitHub	Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116	Aug 16 2018
490554aa0f36	Gennadiy Civil/GitHub	Merge pull request #1746 from google/B60C9E9743233AA81897617B277709DF	Aug 16 2018
ca87cc72e222	Abseil Team/Gennadiy Civil	googletest export	Aug 15 2018
1246e5807a94	Gennadiy Civil/GitHub	Merge branch 'master' into cleanup-cmake	Aug 15 2018
2172c08c9241	Gennadiy Civil/GitHub	Merge pull request #1697 from morris-stock/ignore-cmake-generated-files	Aug 15 2018
3c4f437c241b	Gennadiy Civil/GitHub	Merge branch 'master' into master	Aug 15 2018
06b975928878	Gennadiy Civil/GitHub	Merge branch 'master' into ignore-cmake-generated-files	Aug 15 2018

Changes (182)

				Path
	M			.gitignore
	M			CMakeLists.txt
	M			CONTRIBUTING.md
	M			googlemock/CMakeLists.txt
	M			googlemock/include/gmock/gmock-actions.h
	M			googlemock/include/gmock/gmock-cardinalities.h
	M			googlemock/include/gmock/gmock-generated-actions.h
	M			googlemock/include/gmock/gmock-generated-actions.h.pump
	M			googlemock/include/gmock/gmock-generated-function-mockers.h
	M			googlemock/include/gmock/gmock-generated-function-mockers.h.pump
	M			googlemock/include/gmock/gmock-generated-nice-strict.h
	M			googlemock/include/gmock/gmock-generated-nice-strict.h.pump
	M			googlemock/include/gmock/gmock-matchers.h
	M			googlemock/include/gmock/gmock-more-actions.h
	M			googlemock/include/gmock/gmock-more-matchers.h
	M			googlemock/include/gmock/gmock-spec-builders.h
	M			googlemock/include/gmock/gmock.h
	A			googlemock/include/gmock/internal/custom/README.md
	M			googlemock/include/gmock/internal/custom/gmock-matchers.h
	M			googlemock/include/gmock/internal/custom/gmock-port.h
	M			googlemock/include/gmock/internal/gmock-generated-internal-utils.h
	M			googlemock/include/gmock/internal/gmock-generated-internal-utils.h.pump
	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/scripts/generator/cpp/gmock_class_test.py
	M			googlemock/src/gmock-all.cc
	M			googlemock/src/gmock-cardinalities.cc
	M			googlemock/src/gmock-internal-utils.cc
	M			googlemock/src/gmock-matchers.cc
	M			googlemock/src/gmock-spec-builders.cc
	M			googlemock/src/gmock.cc
	M			googlemock/src/gmock_main.cc
	M			googlemock/test/gmock-actions_test.cc
	M			googlemock/test/gmock-cardinalities_test.cc
	M			googlemock/test/gmock-generated-actions_test.cc
	M			googlemock/test/gmock-generated-function-mockers_test.cc
	M			googlemock/test/gmock-generated-internal-utils_test.cc
	M			googlemock/test/gmock-internal-utils_test.cc
	M			googlemock/test/gmock-matchers_test.cc
	M			googlemock/test/gmock-more-actions_test.cc
	M			googlemock/test/gmock-nice-strict_test.cc
	M			googlemock/test/gmock-port_test.cc
	M			googlemock/test/gmock-spec-builders_test.cc
	M			googlemock/test/gmock_all_test.cc
	M			googlemock/test/gmock_ex_test.cc
	M			googlemock/test/gmock_leak_test.py
	M			googlemock/test/gmock_leak_test_.cc
	M			googlemock/test/gmock_link2_test.cc
	M			googlemock/test/gmock_link_test.cc
	M			googlemock/test/gmock_link_test.h
	M			googlemock/test/gmock_output_test.py
	M			googlemock/test/gmock_output_test_.cc
	M			googlemock/test/gmock_stress_test.cc
	M			googlemock/test/gmock_test.cc
	M			googlemock/test/gmock_test_utils.py
	M			googletest/CMakeLists.txt
	A			googletest/cmake/Config.cmake.in
	M			googletest/cmake/internal_utils.cmake
	M			googletest/docs/advanced.md
	M			googletest/include/gtest/gtest-death-test.h
	M			googletest/include/gtest/gtest-message.h
	M			googletest/include/gtest/gtest-param-test.h
	M			googletest/include/gtest/gtest-param-test.h.pump
	M			googletest/include/gtest/gtest-printers.h
	M			googletest/include/gtest/gtest-spi.h
	M			googletest/include/gtest/gtest-test-part.h
	M			googletest/include/gtest/gtest-typed-test.h
	M			googletest/include/gtest/gtest.h
	M			googletest/include/gtest/gtest_prod.h
	A			googletest/include/gtest/internal/custom/README.md
	M			googletest/include/gtest/internal/custom/gtest-port.h
	M			googletest/include/gtest/internal/custom/gtest-printers.h
	M			googletest/include/gtest/internal/custom/gtest.h
	M			googletest/include/gtest/internal/gtest-death-test-internal.h
	M			googletest/include/gtest/internal/gtest-filepath.h
	M			googletest/include/gtest/internal/gtest-internal.h
	M			googletest/include/gtest/internal/gtest-linked_ptr.h
	M			googletest/include/gtest/internal/gtest-param-util-generated.h
	M			googletest/include/gtest/internal/gtest-param-util-generated.h.pump
	M			googletest/include/gtest/internal/gtest-param-util.h
	M			googletest/include/gtest/internal/gtest-port.h
	M			googletest/include/gtest/internal/gtest-string.h
	M			googletest/include/gtest/internal/gtest-tuple.h
	M			googletest/include/gtest/internal/gtest-tuple.h.pump
	M			googletest/include/gtest/internal/gtest-type-util.h
	M			googletest/include/gtest/internal/gtest-type-util.h.pump
	M			googletest/samples/prime_tables.h
	M			googletest/samples/sample1.cc
	M			googletest/samples/sample1.h
	M			googletest/samples/sample10_unittest.cc
	M			googletest/samples/sample1_unittest.cc
	M			googletest/samples/sample2.cc
	M			googletest/samples/sample2.h
	M			googletest/samples/sample2_unittest.cc
	M			googletest/samples/sample3-inl.h
	M			googletest/samples/sample3_unittest.cc
	M			googletest/samples/sample4.cc
	M			googletest/samples/sample4.h
	M			googletest/samples/sample4_unittest.cc
	M			googletest/samples/sample5_unittest.cc
	M			googletest/samples/sample6_unittest.cc
	M			googletest/samples/sample7_unittest.cc
	M			googletest/samples/sample8_unittest.cc
	M			googletest/samples/sample9_unittest.cc
	M			googletest/src/gtest-all.cc
	M			googletest/src/gtest-death-test.cc
	M			googletest/src/gtest-filepath.cc
	M			googletest/src/gtest-internal-inl.h
	M			googletest/src/gtest-port.cc
	M			googletest/src/gtest-printers.cc
	M			googletest/src/gtest-test-part.cc
	M			googletest/src/gtest-typed-test.cc
	M			googletest/src/gtest.cc
	M			googletest/src/gtest_main.cc
	M			googletest/test/googletest-break-on-failure-unittest.py
	M			googletest/test/googletest-break-on-failure-unittest_.cc
	M			googletest/test/googletest-catch-exceptions-test.py
	M			googletest/test/googletest-catch-exceptions-test_.cc
	M			googletest/test/googletest-color-test.py
	M			googletest/test/googletest-color-test_.cc
	M			googletest/test/googletest-death-test-test.cc
	M			googletest/test/googletest-death-test_ex_test.cc
	M			googletest/test/googletest-env-var-test.py
	M			googletest/test/googletest-env-var-test_.cc
	M			googletest/test/googletest-filepath-test.cc
	M			googletest/test/googletest-filter-unittest.py
	M			googletest/test/googletest-filter-unittest_.cc
	M			googletest/test/googletest-json-outfiles-test.py
	M			googletest/test/googletest-linked-ptr-test.cc
	M			googletest/test/googletest-list-tests-unittest.py
	M			googletest/test/googletest-list-tests-unittest_.cc
	M			googletest/test/googletest-listener-test.cc
	M			googletest/test/googletest-message-test.cc
	M			googletest/test/googletest-options-test.cc
	M			googletest/test/googletest-output-test.py
	M			googletest/test/googletest-output-test_.cc
	M			googletest/test/googletest-param-test-invalid-name1-test.py
	M			googletest/test/googletest-param-test-invalid-name1-test_.cc
	M			googletest/test/googletest-param-test-invalid-name2-test.py
	M			googletest/test/googletest-param-test-invalid-name2-test_.cc
	M			googletest/test/googletest-param-test-test.cc
	M			googletest/test/googletest-param-test-test.h
	M			googletest/test/googletest-param-test2-test.cc
	M			googletest/test/googletest-port-test.cc
	M			googletest/test/googletest-printers-test.cc
	M			googletest/test/googletest-shuffle-test.py
	M			googletest/test/googletest-shuffle-test_.cc
	M			googletest/test/googletest-test-part-test.cc
	M			googletest/test/googletest-test2_test.cc
	M			googletest/test/googletest-throw-on-failure-test.py
	M			googletest/test/googletest-throw-on-failure-test_.cc
	M			googletest/test/googletest-tuple-test.cc
	M			googletest/test/googletest-uninitialized-test.py
	M			googletest/test/googletest-uninitialized-test_.cc
	M			googletest/test/gtest-typed-test2_test.cc
	M			googletest/test/gtest-typed-test_test.cc
	M			googletest/test/gtest-typed-test_test.h
	M			googletest/test/gtest-unittest-api_test.cc
	M			googletest/test/gtest_all_test.cc
	M			googletest/test/gtest_assert_by_exception_test.cc
	M			googletest/test/gtest_environment_test.cc
	M			googletest/test/gtest_help_test.py
	M			googletest/test/gtest_help_test_.cc
	M			googletest/test/gtest_main_unittest.cc
	M			googletest/test/gtest_no_test_unittest.cc
	M			googletest/test/gtest_premature_exit_test.cc
	M			googletest/test/gtest_prod_test.cc
	M			googletest/test/gtest_repeat_test.cc
	M			googletest/test/gtest_sole_header_test.cc
	M			googletest/test/gtest_stress_test.cc
	M			googletest/test/gtest_test_macro_stack_footprint_test.cc
	M			googletest/test/gtest_test_utils.py
	M			googletest/test/gtest_testbridge_test.py
	M			googletest/test/gtest_testbridge_test_.cc
	M			googletest/test/gtest_throw_on_failure_ex_test.cc
	M			googletest/test/gtest_unittest.cc
	M			googletest/test/gtest_xml_outfile1_test_.cc
	M			googletest/test/gtest_xml_outfile2_test_.cc
	M			googletest/test/gtest_xml_outfiles_test.py
	M			googletest/test/production.cc
	M			googletest/test/production.h