Merge remote-tracking branch 'origin/master' into feature/android

author Po Lu <luangruo@yahoo.com>

Mon, 10 Jul 2023 00:21:59 +0000 (08:21 +0800)

committer Po Lu <luangruo@yahoo.com>

Mon, 10 Jul 2023 00:21:59 +0000 (08:21 +0800)
author Po Lu <luangruo@yahoo.com>
Mon, 10 Jul 2023 00:21:59 +0000 (08:21 +0800)
committer Po Lu <luangruo@yahoo.com>
Mon, 10 Jul 2023 00:21:59 +0000 (08:21 +0800)
diff --cc admin/merge-gnulib
Simple merge
diff --cc configure.ac
Simple merge
author	Po Lu <luangruo@yahoo.com>
	Mon, 10 Jul 2023 00:21:59 +0000 (08:21 +0800)
committer	Po Lu <luangruo@yahoo.com>
	Mon, 10 Jul 2023 00:21:59 +0000 (08:21 +0800)
		1	2
admin/merge-gnulib	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history