Diffusion sp4e-homework-lars-bertil 24696c3958f0

Merge branch 'master' into master
24696c3958f0
Actions

Authored by Che-Hsun Liu <chehsunliu@gmail.com> on Aug 14 2017, 08:51.

Description

Merge branch 'master' into master

Details

Committed

GitHub <noreply@github.com>

Aug 14 2017, 08:51

Pushed

• trottet

Dec 4 2019, 13:52

Parents

R9484:673c975a963f: Merge pull request #905 from iignatev/master
R9484:509f7fe84094: Update googletest README.md

Branches

Unknown

Tags

Unknown

Event Timeline

GitHub <noreply@github.com> committed R9484:24696c3958f0: Merge branch 'master' into master (authored by Che-Hsun Liu <chehsunliu@gmail.com>).Aug 14 2017, 08:51

Merged Changes

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

Commit	Author	Details	Committed
673c975a963f	Gennadiy Civil/GitHub	Merge pull request #905 from iignatev/master	Aug 14 2017
9816b96a6ddc	Gennadiy Civil/GitHub	Merge pull request #857 from KindDragon/patch-1	Aug 11 2017
c7f4849c0b71	Gennadiy Civil/GitHub	Merge pull request #919 from delaitre/patch-1	Aug 11 2017
052df998c46b	Gennadiy Civil/GitHub	Merge pull request #749 from nholthaus/patch-1	Aug 11 2017
e533ff4bd33c	Gennadiy Civil/GitHub	Merge pull request #926 from bartshappee/patch-1	Aug 11 2017
e3bd4cbeaeef	Gennadiy Civil/GitHub	Merge pull request #1160 from mwoehlke-kitware/honor-lib_suffix	Aug 11 2017
c81be0f6fc06	Gennadiy Civil/GitHub	Merge pull request #871 from tommyleo2/master	Aug 11 2017
c523461f3ae8	Gennadiy Civil/GitHub	Merge pull request #937 from srz-zumix/fix-gtest-port-typo	Aug 11 2017
4283f264d6ee	Gennadiy Civil/GitHub	Merge pull request #957 from sglass68/sim	Aug 11 2017
c822c85659d5	Gennadiy Civil/GitHub	Merge pull request #1164 from aninf-wo/hethi/remove-old-docs	Aug 11 2017
1579064390bd	Gennadiy Civil/GitHub	Merge pull request #1127 from zulkarnine/patch-1	Aug 11 2017
cfab28d59448	Gennadiy Civil/GitHub	Merge pull request #1192 from eduherminio/master	Aug 11 2017
e5781865289e	Gennadiy Civil/GitHub	Merge pull request #1191 from gennadiycivil/master	Aug 11 2017
97a8498873ba	misterg	Addressing Comments	Aug 10 2017
c3f65335b79f	misterg	Addressing comments	Aug 10 2017
4e284ee657ff	Gennadiy Civil/GitHub	Update WORKSPACE	Aug 10 2017
dc7214f222a8	Herbert Thielen	say "former version" instead of "released version"	Aug 10 2017
854b28f19903	Eduardo Caceres	Minor style fixes	Aug 10 2017
cb5b05436dfc	misterg	Added Copyright	Aug 10 2017
b98e30b42704	misterg	Initial Revision, review 164634031	Aug 10 2017
75f0723c4522	Gennadiy Civil/GitHub	Merge pull request #1178 from aninf-wo/hethi/testsuite-hint	Aug 10 2017
c09e9e646de8	Herbert Thielen	clarify distinction regarding Test Case	Aug 10 2017
0e8e0e07d6c4	Matthew Woehlke	Fix library install destinations	Aug 9 2017
66a036959f09	misterg	WIP	Aug 9 2017
5a5e3c17bbec	misterg	Added googlemock tests	Aug 9 2017
4f5c01b4c969	misterg	Added googlemock tests	Aug 9 2017
ac885f3ab2a5	misterg	WIP	Aug 9 2017
33edcaed8995	Herbert Thielen	be more specific on Test Case	Aug 9 2017
b322d1d91d92	Gennadiy Civil/GitHub	Merge pull request #1185 from eduherminio/master	Aug 9 2017
67fcf00703aa	Eduardo Cáceres/GitHub	Punctuation	Aug 9 2017
e022dcded846	Herbert Thielen	Merge branch 'master' into hethi/remove-old-docs	Aug 9 2017
461713fec460	Gennadiy Civil/GitHub	Merge pull request #1123 from chromy/upstream-141765019	Aug 8 2017
aadf53d2a2c1	Gennadiy Civil/GitHub	Merge pull request #1122 from chromy/upstream-146491438	Aug 8 2017
ab8f2b0d09eb	misterg	WIP, win testing	Aug 8 2017
e66b6bc86805	misterg	WIP, win testing	Aug 8 2017
40a909b4e543	misterg	WIP, windows testing	Aug 8 2017
a2006b2ab034	misterg	WIP, windows testing	Aug 8 2017
c75de0aa924d	misterg	WIP, windows testing	Aug 8 2017
8815087cfa12	misterg	WIP	Aug 8 2017
6ae9cc7894ad	Gennadiy Civil/GitHub	Merge pull request #925 from edgarriba/patch-1	Aug 8 2017
40aa72c7dcfd	Gennadiy Civil/GitHub	Merge pull request #675 from theHacker/master	Aug 8 2017
f8d909d095ec	Gennadiy Civil/GitHub	Merge pull request #1173 from shlomif/correct-typo	Aug 8 2017
22d1a7a1a70a	Gennadiy Civil/GitHub	Merge pull request #909 from AsturaPhoenix/patch-1	Aug 8 2017
7890f7215e35	Gennadiy Civil/GitHub	Merge pull request #1180 from aconverse/master	Aug 7 2017
eb261b4dce67	Gennadiy Civil/GitHub	Merge pull request #1176 from aninf-wo/hethi/typo	Aug 7 2017
aecea3842c3a	misterg	Samples changes upstreaming	Aug 7 2017
52a9c14c48ed	misterg	Samples changes upstreaming	Aug 7 2017
0f702cebb0e6	Herbert Thielen	add note about different definitions of Test Case	Aug 5 2017
212f4d793e5f	Herbert Thielen	fix small typo in comment	Aug 5 2017
aac403334d57	Shlomi Fish	Correct some typos in a comment	Aug 4 2017

Changes (88)

				Path
	M			.gitignore
	A			BUILD.bazel
	M			CMakeLists.txt
	M			README.md
	A			WORKSPACE
	M			googlemock/CHANGES
	M			googlemock/CMakeLists.txt
	M			googlemock/README.md
	M			googlemock/configure.ac
	M			googlemock/docs/CookBook.md
	M			googlemock/docs/DevGuide.md
	M			googlemock/docs/Documentation.md
	M			googlemock/docs/ForDummies.md
	D			googlemock/docs/v1_5
	D			googlemock/docs/v1_5/CheatSheet.md
	D			googlemock/docs/v1_5/CookBook.md
	D			googlemock/docs/v1_5/Documentation.md
	D			googlemock/docs/v1_5/ForDummies.md
	D			googlemock/docs/v1_5/FrequentlyAskedQuestions.md
	D			googlemock/docs/v1_6
	D			googlemock/docs/v1_6/CheatSheet.md
	D			googlemock/docs/v1_6/CookBook.md
	D			googlemock/docs/v1_6/Documentation.md
	D			googlemock/docs/v1_6/ForDummies.md
	D			googlemock/docs/v1_6/FrequentlyAskedQuestions.md
	D			googlemock/docs/v1_7
	D			googlemock/docs/v1_7/CheatSheet.md
	D			googlemock/docs/v1_7/CookBook.md
	D			googlemock/docs/v1_7/Documentation.md
	D			googlemock/docs/v1_7/ForDummies.md
	D			googlemock/docs/v1_7/FrequentlyAskedQuestions.md
	M			googlemock/include/gmock/gmock-actions.h
	M			googlemock/include/gmock/gmock-matchers.h
	M			googlemock/src/gmock-matchers.cc
	A			googlemock/test/BUILD.bazel
	M			googlemock/test/gmock-generated-actions_test.cc
	M			googletest/CMakeLists.txt
	M			googletest/Makefile.am
	M			googletest/docs/AdvancedGuide.md
	M			googletest/docs/DevGuide.md
	M			googletest/docs/Documentation.md
	M			googletest/docs/FAQ.md
	M			googletest/docs/Primer.md
	M			googletest/docs/PumpManual.md
	D			googletest/docs/V1_5_AdvancedGuide.md
	D			googletest/docs/V1_5_Documentation.md
	D			googletest/docs/V1_5_FAQ.md
	D			googletest/docs/V1_5_Primer.md
	D			googletest/docs/V1_5_PumpManual.md
	D			googletest/docs/V1_5_XcodeGuide.md
	D			googletest/docs/V1_6_AdvancedGuide.md
	D			googletest/docs/V1_6_Documentation.md
	D			googletest/docs/V1_6_FAQ.md
	D			googletest/docs/V1_6_Primer.md
	D			googletest/docs/V1_6_PumpManual.md
	D			googletest/docs/V1_6_Samples.md
	D			googletest/docs/V1_6_XcodeGuide.md
	D			googletest/docs/V1_7_AdvancedGuide.md
	D			googletest/docs/V1_7_Documentation.md
	D			googletest/docs/V1_7_FAQ.md
	D			googletest/docs/V1_7_Primer.md
	D			googletest/docs/V1_7_PumpManual.md
	D			googletest/docs/V1_7_Samples.md
	D			googletest/docs/V1_7_XcodeGuide.md
	M			googletest/docs/XcodeGuide.md
	M			googletest/include/gtest/internal/gtest-port.h
	M			googletest/samples/sample1.cc
	M			googletest/samples/sample10_unittest.cc
	M			googletest/samples/sample1_unittest.cc
	M			googletest/samples/sample2_unittest.cc
	M			googletest/samples/sample3_unittest.cc
	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/upload.py
	M			googletest/src/gtest-death-test.cc
	M			googletest/src/gtest-port.cc
	M			googletest/src/gtest.cc
	A			googletest/test/BUILD.bazel
	M			googletest/test/gtest-port_test.cc
	M			googletest/test/gtest_test_utils.py
	M			googletest/test/gtest_unittest.cc
	M			googletest/test/gtest_xml_outfiles_test.py
	M			googletest/test/gtest_xml_output_unittest.py
	M			googletest/xcode/Scripts/versiongenerate.py