Diffusion sp4e-homework-lars-bertil 687964c84f79

Merge branch 'master' into fix-argc
687964c84f79
Actions

Authored by Conor Burgess <Burgess.Conor@gmail.com> on Aug 17 2018, 18:15.

Description

Merge branch 'master' into fix-argc

Details

Committed

GitHub <noreply@github.com>

Aug 17 2018, 18:15

Pushed

• trottet

Dec 4 2019, 13:52

Parents

R9484:f11a8f913158: Merge branch 'master' into fix-argc
R9484:02a8ca877356: Merge pull request #1546 from henryiii/cleanup-cmake

Branches

Unknown

Tags

Unknown

Event Timeline

GitHub <noreply@github.com> committed R9484:687964c84f79: Merge branch 'master' into fix-argc (authored by Conor Burgess <Burgess.Conor@gmail.com>).Aug 17 2018, 18:15

Merged Changes

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

Commit	Author	Details	Committed
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
f3a9fa6a62a2	Gennadiy Civil/GitHub	Merge branch 'master' into master	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
997d343dd680	Gennadiy Civil/GitHub	Merge pull request #1734 from eliasdaler/cmake-binary-dir-fix	Aug 15 2018
02671abb44c8	Gennadiy Civil/GitHub	Merge branch 'master' into cmake-binary-dir-fix	Aug 14 2018
587ceaeaee6c	Gennadiy Civil/GitHub	Merge pull request #1741 from gennadiycivil/master	Aug 14 2018
f0e4c411ca08	Gennadiy Civil	more comments changes	Aug 14 2018
e26771776b26	Gennadiy Civil/GitHub	Merge branch 'master' into cmake-binary-dir-fix	Aug 14 2018
bbf738a2c105	Gennadiy Civil	more comments changes	Aug 14 2018
265efde9a5b3	Gennadiy Civil	Comments changes, no functionality changes.	Aug 14 2018
3306848f6975	Gennadiy Civil/GitHub	Merge pull request #1740 from gennadiycivil/master	Aug 14 2018
a3c0dd0f4d58	Gennadiy Civil	Comments changes, no functionality changes	Aug 14 2018
41fec5588154	Gennadiy Civil/GitHub	Merge pull request #1665 from rongjiecomputer/deprecate	Aug 14 2018
2421eff9f780	Gennadiy Civil/GitHub	Merge branch 'master' into deprecate	Aug 14 2018
17714d65e158	Gennadiy Civil/GitHub	Merge pull request #1738 from gennadiycivil/master	Aug 14 2018
f225735222b5	Gennadiy Civil	Code formatting changes, clean up, no functionality changes	Aug 14 2018
15ef6ec064d8	Gennadiy Civil/GitHub	Merge pull request #1733 from gennadiycivil/master	Aug 14 2018
caeaef302d76	Gennadiy Civil/GitHub	Merge branch 'master' into master	Aug 14 2018
87a37c60e314	tisi1988/GitHub	Merge branch 'master' into master	Aug 14 2018
c203bee2457e	Gennadiy Civil	formatting custom/README.md	Aug 14 2018
9060e19c87d6	Gennadiy Civil	formatting for new READMEs	Aug 13 2018
8bc11c040a1d	Gennadiy Civil/GitHub	Merge pull request #924 from wind-river-cdt/cross-testing-patch-1	Aug 13 2018
9ca399ae053d	Elias Daler	Change location of generated pkg-config files from CMAKE_BINARY_DIR to…	Aug 13 2018
47b57ff1b2f4	Gennadiy Civil/GitHub	Merge branch 'master' into cross-testing-patch-1	Aug 13 2018
44fb2a1edd62	Gennadiy Civil	Merge branch 'master' of https://github.com/google/googletest	Aug 13 2018
63baab8924f5	Gennadiy Civil	Move instructions into custom/README files	Aug 13 2018
7800ba3eeade	Gennadiy Civil/GitHub	Merge pull request #1732 from gennadiycivil/master	Aug 13 2018
18c940d13a58	Gennadiy Civil	comment cleanup	Aug 13 2018
65b42fa6152c	Gennadiy Civil/GitHub	Merge pull request #1731 from 2power10/master	Aug 13 2018
ecc241900a1e	Yi Zheng/Yi Zheng	- Fix the broken markdown table - Fix some format issue	Aug 13 2018
ae94a9097d76	Gennadiy Civil/GitHub	Merge pull request #1727 from gennadiycivil/master	Aug 10 2018
390a6b793217	Gennadiy Civil	Mode change on a python script	Aug 10 2018
8cccb2a718c3	Gennadiy Civil/GitHub	Update README.md	Aug 10 2018
9cb381952ecf	Gennadiy Civil/GitHub	Merge pull request #1726 from google/gennadiycivil-patch-2	Aug 10 2018
b1236528fef2	Gennadiy Civil/GitHub	Update README.md	Aug 10 2018
77ac31c35f15	Gennadiy Civil/GitHub	Update README.md	Aug 10 2018
4de527dc2cc2	Gennadiy Civil/GitHub	Update README.md	Aug 10 2018
945618b2025b	Gennadiy Civil/GitHub	Update README.md	Aug 10 2018

Changes (257)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path
	M			.gitignore
	M			.travis.yml
	M			BUILD.bazel
	M			README.md
	M			appveyor.yml
	M			ci/travis.sh
	M			googlemock/CMakeLists.txt
	M			googlemock/README.md
	M			googlemock/docs/CheatSheet.md
	M			googlemock/docs/CookBook.md
	M			googlemock/docs/ForDummies.md
	M			googlemock/docs/FrequentlyAskedQuestions.md
	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-matchers.h
	M			googlemock/include/gmock/gmock-generated-matchers.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-generated-actions.h
	M			googlemock/include/gmock/internal/custom/gmock-generated-actions.h.pump
	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/README
	M			googlemock/scripts/upload.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-generated-matchers_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_output_test_golden.txt
	M			googlemock/test/gmock_stress_test.cc
	M			googlemock/test/gmock_test.cc
	M			googlemock/test/gmock_test_utils.py
	M			googletest/CMakeLists.txt
	M			googletest/Makefile.am
	M			googletest/README.md
	M			googletest/cmake/internal_utils.cmake
	D			googletest/docs/AdvancedGuide.md
	D			googletest/docs/Documentation.md
	D			googletest/docs/FAQ.md
	D			googletest/docs/Primer.md
	D			googletest/docs/Samples.md
	M			googletest/docs/XcodeGuide.md
	A			googletest/docs/advanced.md
	A			googletest/docs/faq.md
	A			googletest/docs/primer.md
	A			googletest/docs/samples.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_pred_impl.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-arch.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/scripts/fuse_gtest_files.py
	M			googletest/scripts/gen_gtest_pred_impl.py
	M			googletest/scripts/upload.py
	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
	P			googletest/src/gtest_main.cc Copied to multiple locations: googletest/test/googletest-param-test-invalid-name1-test_.cc googletest/test/googletest-param-test-invalid-name2-test_.cc
	M			googletest/test/BUILD.bazel
	V			googletest/test/{googletest-break-on-failure-unittest.py ← gtest_break_on_failure_unittest.py}
	V			googletest/test/{googletest-break-on-failure-unittest_.cc ← gtest_break_on_failure_unittest_.cc}
	V			googletest/test/{googletest-catch-exceptions-test.py ← gtest_catch_exceptions_test.py}
	V			googletest/test/{googletest-catch-exceptions-test_.cc ← gtest_catch_exceptions_test_.cc}
	V			googletest/test/{googletest-color-test.py ← gtest_color_test.py}
	V			googletest/test/{googletest-color-test_.cc ← gtest_color_test_.cc}
	V			googletest/test/{googletest-death-test-test.cc ← gtest-death-test_test.cc}
	V			googletest/test/{googletest-death-test_ex_test.cc ← gtest-death-test_ex_test.cc}
	V			googletest/test/{googletest-env-var-test.py ← gtest_env_var_test.py}
	V			googletest/test/{googletest-env-var-test_.cc ← gtest_env_var_test_.cc}
	V			googletest/test/{googletest-filepath-test.cc ← gtest-filepath_test.cc}
	V			googletest/test/{googletest-filter-unittest.py ← gtest_filter_unittest.py}
	V			googletest/test/{googletest-filter-unittest_.cc ← gtest_filter_unittest_.cc}
	P			googletest/test/googletest-json-outfiles-test.py Copied from googletest/test/gtest_xml_outfiles_test.py
	A			googletest/test/googletest-json-output-unittest.py
	V			googletest/test/{googletest-linked-ptr-test.cc ← gtest-linked_ptr_test.cc}
	V			googletest/test/{googletest-list-tests-unittest.py ← gtest_list_tests_unittest.py}
	V			googletest/test/{googletest-list-tests-unittest_.cc ← gtest_list_tests_unittest_.cc}
	V			googletest/test/{googletest-listener-test.cc ← gtest-listener_test.cc}
	V			googletest/test/{googletest-message-test.cc ← gtest-message_test.cc}
	V			googletest/test/{googletest-options-test.cc ← gtest-options_test.cc}
	V			googletest/test/{googletest-output-test-golden-lin.txt ← gtest_output_test_golden_lin.txt}
	V			googletest/test/{googletest-output-test.py ← gtest_output_test.py}
	V			googletest/test/{googletest-output-test_.cc ← gtest_output_test_.cc}
	P			googletest/test/googletest-param-test-invalid-name1-test.py Copied from googletest/test/gtest_uninitialized_test.py
	P			googletest/test/googletest-param-test-invalid-name1-test_.cc Copied from googletest/src/gtest_main.cc
	P			googletest/test/googletest-param-test-invalid-name2-test.py Copied from googletest/test/gtest_uninitialized_test.py
	P			googletest/test/googletest-param-test-invalid-name2-test_.cc Copied from googletest/src/gtest_main.cc
	V			googletest/test/{googletest-param-test-test.cc ← gtest-param-test_test.cc}
	V			googletest/test/{googletest-param-test-test.h ← gtest-param-test_test.h}
	P			googletest/test/googletest-param-test2-test.cc Copied from googletest/test/gtest-param-test2_test.cc
	V			googletest/test/{googletest-port-test.cc ← gtest-port_test.cc}
	V			googletest/test/{googletest-printers-test.cc ← gtest-printers_test.cc}
	V			googletest/test/{googletest-shuffle-test.py ← gtest_shuffle_test.py}
	V			googletest/test/{googletest-shuffle-test_.cc ← gtest_shuffle_test_.cc}
	V			googletest/test/{googletest-test-part-test.cc ← gtest-test-part_test.cc}
	V			googletest/test/{googletest-test2_test.cc ← gtest-param-test2_test.cc}
	V			googletest/test/{googletest-throw-on-failure-test.py ← gtest_throw_on_failure_test.py}
	V			googletest/test/{googletest-throw-on-failure-test_.cc ← gtest_throw_on_failure_test_.cc}
	V			googletest/test/{googletest-tuple-test.cc ← gtest-tuple_test.cc}
	P			googletest/test/googletest-uninitialized-test.py Copied from googletest/test/gtest_uninitialized_test.py
	V			googletest/test/{googletest-uninitialized-test_.cc ← gtest_uninitialized_test_.cc}
	V			googletest/test/{gtest-death-test_ex_test.cc → googletest-death-test_ex_test.cc}
	V			googletest/test/{gtest-death-test_test.cc → googletest-death-test-test.cc}
	V			googletest/test/{gtest-filepath_test.cc → googletest-filepath-test.cc}
	V			googletest/test/{gtest-linked_ptr_test.cc → googletest-linked-ptr-test.cc}
	V			googletest/test/{gtest-listener_test.cc → googletest-listener-test.cc}
	V			googletest/test/{gtest-message_test.cc → googletest-message-test.cc}
	V			googletest/test/{gtest-options_test.cc → googletest-options-test.cc}
	P			googletest/test/gtest-param-test2_test.cc Deleted after being copied to multiple locations: googletest/test/googletest-param-test2-test.cc googletest/test/googletest-test2_test.cc
	V			googletest/test/{gtest-param-test_test.cc → googletest-param-test-test.cc}
	V			googletest/test/{gtest-param-test_test.h → googletest-param-test-test.h}
	V			googletest/test/{gtest-port_test.cc → googletest-port-test.cc}
	V			googletest/test/{gtest-printers_test.cc → googletest-printers-test.cc}
	V			googletest/test/{gtest-test-part_test.cc → googletest-test-part-test.cc}
	V			googletest/test/{gtest-tuple_test.cc → googletest-tuple-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
	V			googletest/test/{gtest_break_on_failure_unittest.py → googletest-break-on-failure-unittest.py}
	V			googletest/test/{gtest_break_on_failure_unittest_.cc → googletest-break-on-failure-unittest_.cc}
	V			googletest/test/{gtest_catch_exceptions_test.py → googletest-catch-exceptions-test.py}
	V			googletest/test/{gtest_catch_exceptions_test_.cc → googletest-catch-exceptions-test_.cc}
	V			googletest/test/{gtest_color_test.py → googletest-color-test.py}
	V			googletest/test/{gtest_color_test_.cc → googletest-color-test_.cc}
	V			googletest/test/{gtest_env_var_test.py → googletest-env-var-test.py}
	V			googletest/test/{gtest_env_var_test_.cc → googletest-env-var-test_.cc}
	M			googletest/test/gtest_environment_test.cc
	V			googletest/test/{gtest_filter_unittest.py → googletest-filter-unittest.py}
	V			googletest/test/{gtest_filter_unittest_.cc → googletest-filter-unittest_.cc}
	M			googletest/test/gtest_help_test.py
	M			googletest/test/gtest_help_test_.cc
	P			googletest/test/gtest_json_test_utils.py Copied from googletest/test/gtest_uninitialized_test.py
	V			googletest/test/{gtest_list_tests_unittest.py → googletest-list-tests-unittest.py}
	V			googletest/test/{gtest_list_tests_unittest_.cc → googletest-list-tests-unittest_.cc}
	P			googletest/test/gtest_main_unittest.cc Copied to googletest/test/gtest_testbridge_test_.cc
	M			googletest/test/gtest_no_test_unittest.cc
	V			googletest/test/{gtest_output_test.py → googletest-output-test.py}
	V			googletest/test/{gtest_output_test_.cc → googletest-output-test_.cc}
	V			googletest/test/{gtest_output_test_golden_lin.txt → googletest-output-test-golden-lin.txt}
	M			googletest/test/gtest_premature_exit_test.cc
	M			googletest/test/gtest_prod_test.cc
	M			googletest/test/gtest_repeat_test.cc
	V			googletest/test/{gtest_shuffle_test.py → googletest-shuffle-test.py}
	V			googletest/test/{gtest_shuffle_test_.cc → googletest-shuffle-test_.cc}
	M			googletest/test/gtest_sole_header_test.cc
	M			googletest/test/gtest_stress_test.cc
	A			googletest/test/gtest_test_macro_stack_footprint_test.cc
	M			googletest/test/gtest_test_utils.py
	V			googletest/test/{gtest_testbridge_test.py ← gtest_uninitialized_test.py}
	P			googletest/test/gtest_testbridge_test_.cc Copied from googletest/test/gtest_main_unittest.cc
	M			googletest/test/gtest_throw_on_failure_ex_test.cc
	V			googletest/test/{gtest_throw_on_failure_test.py → googletest-throw-on-failure-test.py}
	V			googletest/test/{gtest_throw_on_failure_test_.cc → googletest-throw-on-failure-test_.cc}
	P			googletest/test/gtest_uninitialized_test.py Deleted after being copied to multiple locations: googletest/test/googletest-param-test-invalid-name1-test.py googletest/test/googletest-param-test-invalid-name2-test.py googletest/test/googletest-uninitialized-test.py googletest/test/gtest_json_test_utils.py googletest/test/gtest_testbridge_test.py
	V			googletest/test/{gtest_uninitialized_test_.cc → googletest-uninitialized-test_.cc}
	M			googletest/test/gtest_unittest.cc
	M			googletest/test/gtest_xml_outfile1_test_.cc
	M			googletest/test/gtest_xml_outfile2_test_.cc
	P			googletest/test/gtest_xml_outfiles_test.py Copied to googletest/test/googletest-json-outfiles-test.py
	M			googletest/test/gtest_xml_output_unittest.py
	M			googletest/test/gtest_xml_test_utils.py
	M			googletest/test/production.cc
	M			googletest/test/production.h
	M			googletest/xcode/Config/DebugProject.xcconfig
	M			googletest/xcode/Config/FrameworkTarget.xcconfig
	M			googletest/xcode/Config/General.xcconfig
	M			googletest/xcode/Config/ReleaseProject.xcconfig
	M			googletest/xcode/Config/StaticLibraryTarget.xcconfig