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

author Po Lu <luangruo@yahoo.com>

Mon, 5 Jun 2023 23:53:41 +0000 (07:53 +0800)

committer Po Lu <luangruo@yahoo.com>

Mon, 5 Jun 2023 23:53:41 +0000 (07:53 +0800)
author Po Lu <luangruo@yahoo.com>
Mon, 5 Jun 2023 23:53:41 +0000 (07:53 +0800)
committer Po Lu <luangruo@yahoo.com>
Mon, 5 Jun 2023 23:53:41 +0000 (07:53 +0800)
diff --cc etc/NEWS
Simple merge
diff --cc src/keyboard.c
Simple merge
author	Po Lu <luangruo@yahoo.com>
	Mon, 5 Jun 2023 23:53:41 +0000 (07:53 +0800)
committer	Po Lu <luangruo@yahoo.com>
	Mon, 5 Jun 2023 23:53:41 +0000 (07:53 +0800)
		1	2
etc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
src/keyboard.c	patch \|	diff1 \|	diff2 \|	blob \| history