Merge pull request #2747 from Helflym/dev

author Yann Collet <Cyan4973@users.noreply.github.com>

Fri, 1 Oct 2021 15:13:39 +0000 (08:13 -0700)

committer GitHub <noreply@github.com>

Fri, 1 Oct 2021 15:13:39 +0000 (08:13 -0700)
author Yann Collet <Cyan4973@users.noreply.github.com>
Fri, 1 Oct 2021 15:13:39 +0000 (08:13 -0700)
committer GitHub <noreply@github.com>
Fri, 1 Oct 2021 15:13:39 +0000 (08:13 -0700)
diff --cc Makefile
Simple merge
diff --cc lib/Makefile
Simple merge
diff --cc programs/Makefile
Simple merge
diff --cc tests/Makefile
Simple merge
diff --cc tests/playTests.sh
Simple merge
author	Yann Collet <Cyan4973@users.noreply.github.com>
	Fri, 1 Oct 2021 15:13:39 +0000 (08:13 -0700)
committer	GitHub <noreply@github.com>
	Fri, 1 Oct 2021 15:13:39 +0000 (08:13 -0700)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
lib/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
programs/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
tests/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
tests/playTests.sh	patch \|	diff1 \|	diff2 \|	blob \| history