Merge pull request #1649 from petris/master

author Martin Matuška <martin@matuska.org>

Mon, 3 Jan 2022 10:39:15 +0000 (11:39 +0100)

committer GitHub <noreply@github.com>

Mon, 3 Jan 2022 10:39:15 +0000 (11:39 +0100)
author Martin Matuška <martin@matuska.org>
Mon, 3 Jan 2022 10:39:15 +0000 (11:39 +0100)
committer GitHub <noreply@github.com>
Mon, 3 Jan 2022 10:39:15 +0000 (11:39 +0100)
diff --cc CMakeLists.txt
Simple merge
diff --cc build/cmake/config.h.in
Simple merge
diff --cc configure.ac
Simple merge
author	Martin Matuška <martin@matuska.org>
	Mon, 3 Jan 2022 10:39:15 +0000 (11:39 +0100)
committer	GitHub <noreply@github.com>
	Mon, 3 Jan 2022 10:39:15 +0000 (11:39 +0100)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
build/cmake/config.h.in	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history