Merge branch 'develop' into macos-develop

author Eric Branlund <ebranlund@fastmail.com>

Mon, 8 Jan 2024 15:58:46 +0000 (08:58 -0700)

committer Eric Branlund <ebranlund@fastmail.com>

Mon, 8 Jan 2024 15:58:46 +0000 (08:58 -0700)
author Eric Branlund <ebranlund@fastmail.com>
Mon, 8 Jan 2024 15:58:46 +0000 (08:58 -0700)
committer Eric Branlund <ebranlund@fastmail.com>
Mon, 8 Jan 2024 15:58:46 +0000 (08:58 -0700)
diff --cc configure.ac
Simple merge
diff --cc src/Makefile.am
Simple merge
author	Eric Branlund <ebranlund@fastmail.com>
	Mon, 8 Jan 2024 15:58:46 +0000 (08:58 -0700)
committer	Eric Branlund <ebranlund@fastmail.com>
	Mon, 8 Jan 2024 15:58:46 +0000 (08:58 -0700)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
src/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history