Diffusion sp4e-homework-lars-bertil 3c4f437c241b

Merge branch 'master' into master
3c4f437c241b
Actions

Authored by Gennadiy Civil <gennadiycivil@users.noreply.github.com> on Aug 15 2018, 20:33.

Description

Merge branch 'master' into master

Details

Committed

GitHub <noreply@github.com>

Aug 15 2018, 20:33

Pushed

• trottet

Dec 4 2019, 13:52

Parents

R9484:87a37c60e314: Merge branch 'master' into master
R9484:997d343dd680: Merge pull request #1734 from eliasdaler/cmake-binary-dir-fix

Branches

Unknown

Tags

Unknown

Event Timeline

GitHub <noreply@github.com> committed R9484:3c4f437c241b: Merge branch 'master' into master (authored by Gennadiy Civil <gennadiycivil@users.noreply.github.com>).Aug 15 2018, 20:33

Merged Changes

Commit	Author	Details	Committed
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
c203bee2457e	Gennadiy Civil	formatting custom/README.md	Aug 14 2018
9060e19c87d6	Gennadiy Civil	formatting for new READMEs	Aug 13 2018
9ca399ae053d	Elias Daler	Change location of generated pkg-config files from CMAKE_BINARY_DIR to…	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
24786cb49823	Loo Rong Jie/GitHub	Merge branch 'master' into deprecate	Aug 9 2018
61f949387e1b	Gennadiy Civil/GitHub	Merge branch 'master' into deprecate	Aug 3 2018
6269264dfec8	Gennadiy Civil/GitHub	Merge branch 'master' into deprecate	Jul 30 2018
6cacb41935a3	Gennadiy Civil/GitHub	Merge branch 'master' into deprecate	Jul 26 2018
fd4f7cc7299e	Gennadiy Civil/GitHub	Merge branch 'master' into deprecate	Jul 20 2018
1f9c668a0452	Gennadiy Civil/GitHub	Merge branch 'master' into deprecate	Jul 19 2018
378de8f72a43	Gennadiy Civil/GitHub	Merge branch 'master' into deprecate	Jul 16 2018
3a8d744030e1	Loo Rong Jie	Disable MSVC function deprecation when using Clang	Jul 13 2018

Changes (174)

				Path
	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/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
	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