Diffusion sp4e-homework-lars-bertil 02671abb44c8

Merge branch 'master' into cmake-binary-dir-fix
02671abb44c8
Actions

Authored by Gennadiy Civil <gennadiycivil@users.noreply.github.com> on Aug 14 2018, 23:25.

Description

Merge branch 'master' into cmake-binary-dir-fix

Details

Committed

GitHub <noreply@github.com>

Aug 14 2018, 23:25

Pushed

• trottet

Dec 4 2019, 13:52

Parents

R9484:587ceaeaee6c: Merge pull request #1741 from gennadiycivil/master
R9484:e26771776b26: Merge branch 'master' into cmake-binary-dir-fix

Branches

Unknown

Tags

Unknown

Event Timeline

GitHub <noreply@github.com> committed R9484:02671abb44c8: Merge branch 'master' into cmake-binary-dir-fix (authored by Gennadiy Civil <gennadiycivil@users.noreply.github.com>).Aug 14 2018, 23:25

Merged Changes

Commit	Author	Details	Committed
587ceaeaee6c	Gennadiy Civil/GitHub	Merge pull request #1741 from gennadiycivil/master	Aug 14 2018
f0e4c411ca08	Gennadiy Civil	more comments changes	Aug 14 2018
bbf738a2c105	Gennadiy Civil	more comments changes	Aug 14 2018
265efde9a5b3	Gennadiy Civil	Comments changes, no functionality changes.	Aug 14 2018

Changes (49)

				Path
	M			googlemock/include/gmock/gmock-matchers.h
	M			googlemock/include/gmock/gmock-spec-builders.h
	M			googlemock/include/gmock/internal/gmock-internal-utils.h
	M			googlemock/src/gmock-spec-builders.cc
	M			googlemock/src/gmock.cc
	M			googlemock/test/gmock-actions_test.cc
	M			googlemock/test/gmock-spec-builders_test.cc
	M			googlemock/test/gmock_leak_test.py
	M			googlemock/test/gmock_output_test.py
	M			googlemock/test/gmock_test_utils.py
	M			googletest/include/gtest/gtest-death-test.h
	M			googletest/include/gtest/gtest-printers.h
	M			googletest/include/gtest/gtest.h
	M			googletest/include/gtest/internal/gtest-linked_ptr.h
	M			googletest/include/gtest/internal/gtest-port.h
	M			googletest/include/gtest/internal/gtest-tuple.h
	M			googletest/include/gtest/internal/gtest-tuple.h.pump
	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.cc
	M			googletest/test/googletest-break-on-failure-unittest.py
	M			googletest/test/googletest-catch-exceptions-test.py
	M			googletest/test/googletest-color-test.py
	M			googletest/test/googletest-death-test-test.cc
	M			googletest/test/googletest-env-var-test.py
	M			googletest/test/googletest-filepath-test.cc
	M			googletest/test/googletest-filter-unittest.py
	M			googletest/test/googletest-json-outfiles-test.py
	M			googletest/test/googletest-list-tests-unittest.py
	M			googletest/test/googletest-options-test.cc
	M			googletest/test/googletest-output-test.py
	M			googletest/test/googletest-param-test-invalid-name1-test.py
	M			googletest/test/googletest-param-test-invalid-name2-test.py
	M			googletest/test/googletest-param-test-test.cc
	M			googletest/test/googletest-port-test.cc
	M			googletest/test/googletest-shuffle-test.py
	M			googletest/test/googletest-test-part-test.cc
	M			googletest/test/googletest-throw-on-failure-test.py
	M			googletest/test/googletest-uninitialized-test.py
	M			googletest/test/gtest_assert_by_exception_test.cc
	M			googletest/test/gtest_help_test.py
	M			googletest/test/gtest_repeat_test.cc
	M			googletest/test/gtest_test_utils.py
	M			googletest/test/gtest_testbridge_test.py
	M			googletest/test/gtest_unittest.cc
	M			googletest/test/gtest_xml_outfiles_test.py