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

author Po Lu <luangruo@yahoo.com>

Fri, 28 Apr 2023 03:53:06 +0000 (11:53 +0800)

committer Po Lu <luangruo@yahoo.com>

Fri, 28 Apr 2023 03:53:06 +0000 (11:53 +0800)
author Po Lu <luangruo@yahoo.com>
Fri, 28 Apr 2023 03:53:06 +0000 (11:53 +0800)
committer Po Lu <luangruo@yahoo.com>
Fri, 28 Apr 2023 03:53:06 +0000 (11:53 +0800)
diff --cc Makefile.in
Simple merge
diff --cc src/image.c
Simple merge
author	Po Lu <luangruo@yahoo.com>
	Fri, 28 Apr 2023 03:53:06 +0000 (11:53 +0800)
committer	Po Lu <luangruo@yahoo.com>
	Fri, 28 Apr 2023 03:53:06 +0000 (11:53 +0800)
		1	2
Makefile.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/image.c	patch \|	diff1 \|	diff2 \|	blob \| history