Diffusion sp4e-homework-lars-bertil 25e1436b087a

Merge branch 'master' into master
25e1436b087a
Actions

Authored by tisi1988 <tisi1988@gmail.com> on Aug 1 2018, 12:11.

Description

Merge branch 'master' into master

Details

Committed

GitHub <noreply@github.com>

Aug 1 2018, 12:11

Pushed

• trottet

Dec 4 2019, 13:52

Parents

R9484:1ae4fdb79009: Merge branch 'master' into master
R9484:4f160f737078: Merge pull request #1691 from gennadiycivil/master

Branches

Unknown

Tags

Unknown

Event Timeline

GitHub <noreply@github.com> committed R9484:25e1436b087a: Merge branch 'master' into master (authored by tisi1988 <tisi1988@gmail.com>).Aug 1 2018, 12:11

Merged Changes

Commit	Author	Details	Committed
4f160f737078	Gennadiy Civil/GitHub	Merge pull request #1691 from gennadiycivil/master	Jul 30 2018
012528ccab97	Gennadiy Civil	Merge branch 'master' of https://github.com/google/googletest	Jul 30 2018
b7cb1bc6f9d6	Gennadiy Civil	small tweaks, OSS merge cl 206357486	Jul 30 2018
00486476193b	Gennadiy Civil/GitHub	Merge pull request #1688 from gennadiycivil/master	Jul 27 2018
ec13264af459	Gennadiy Civil	added missing comments	Jul 27 2018
984cba30ed10	Gennadiy Civil	Formatting changes for automatic code management	Jul 27 2018
40904f897048	Gennadiy Civil/GitHub	Merge pull request #1684 from gennadiycivil/master	Jul 25 2018
ed1edf641dc5	Gennadiy Civil	Formatting changes, code sync	Jul 25 2018
78b49242d1de	Gennadiy Civil/GitHub	Merge pull request #1606 from m-tmatma/feature/fix-build-error-vs2017-win10-jp	Jul 24 2018
a68f0c201de5	Gennadiy Civil/GitHub	Merge branch 'master' into feature/fix-build-error-vs2017-win10-jp	Jul 23 2018
82c858b3add3	Gennadiy Civil/GitHub	Merge pull request #1678 from stianval/master	Jul 23 2018
bb9fc6f66e49	Stian Valle/GitHub	Update primer.md	Jul 21 2018
7abf99d941ba	Stian Valle/GitHub	Update primer.md	Jul 21 2018
baf2115a5927	Stian Valle/GitHub	Update primer.md	Jul 21 2018
534570b5bd8d	Masaru Tsuchiyama/GitHub	Merge branch 'master' into feature/fix-build-error-vs2017-win10-jp	Jul 21 2018
40cd5d117035	Masaru Tsuchiyama/GitHub	Merge branch 'master' into feature/fix-build-error-vs2017-win10-jp	Jul 18 2018
234958def514	Masaru Tsuchiyama/GitHub	Merge branch 'master' into feature/fix-build-error-vs2017-win10-jp	Jul 18 2018
4bcc9b9807b2	Masaru Tsuchiyama	This closes #1595: fix compiler error with Visual Studio 2017 on Win10 JP.	Jun 30 2018

Changes (52)

				Path
	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
	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/test/gmock_stress_test.cc
	M			googletest/docs/primer.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
	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/src/gtest_main.cc
	M			googletest/test/gtest_prod_test.cc
	M			googletest/test/gtest_unittest.cc