Merge remote-tracking branch 'upstream/master'

author Steinar H. Gunderson <sgunderson@bigfoot.com>

Thu, 2 Dec 2021 19:01:42 +0000 (20:01 +0100)

committer Steinar H. Gunderson <sgunderson@bigfoot.com>

Thu, 2 Dec 2021 19:01:42 +0000 (20:01 +0100)
author Steinar H. Gunderson <sgunderson@bigfoot.com>
Thu, 2 Dec 2021 19:01:42 +0000 (20:01 +0100)
committer Steinar H. Gunderson <sgunderson@bigfoot.com>
Thu, 2 Dec 2021 19:01:42 +0000 (20:01 +0100)
diff --cc src/Makefile
Simple merge
diff --cc src/misc.cpp
Simple merge
diff --cc src/position.cpp
Simple merge
author	Steinar H. Gunderson <sgunderson@bigfoot.com>
	Thu, 2 Dec 2021 19:01:42 +0000 (20:01 +0100)
committer	Steinar H. Gunderson <sgunderson@bigfoot.com>
	Thu, 2 Dec 2021 19:01:42 +0000 (20:01 +0100)
		1	2
src/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
src/misc.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/position.cpp	patch \|	diff1 \|	diff2 \|	blob \| history