Merge branch 'master' into Cloudwalk/json

author Cloudwalk <cloudwalk009@gmail.com>

Tue, 20 Apr 2021 18:40:57 +0000 (14:40 -0400)

committer Cloudwalk <cloudwalk009@gmail.com>

Tue, 20 Apr 2021 18:40:57 +0000 (14:40 -0400)
author Cloudwalk <cloudwalk009@gmail.com>
Tue, 20 Apr 2021 18:40:57 +0000 (14:40 -0400)
committer Cloudwalk <cloudwalk009@gmail.com>
Tue, 20 Apr 2021 18:40:57 +0000 (14:40 -0400)
diff --cc host.c
Simple merge
diff --cc makefile.inc
Simple merge
author	Cloudwalk <cloudwalk009@gmail.com>
	Tue, 20 Apr 2021 18:40:57 +0000 (14:40 -0400)
committer	Cloudwalk <cloudwalk009@gmail.com>
	Tue, 20 Apr 2021 18:40:57 +0000 (14:40 -0400)
		1	2
host.c	patch \|	diff1 \|	diff2 \|	blob \| history
makefile.inc	patch \|	diff1 \|	diff2 \|	blob \| history