Merge branch 'master' into Cloudwalk/Host_Init-overhaul

author Cloudwalk <cloudwalk009@gmail.com>

Mon, 17 Aug 2020 15:23:25 +0000 (11:23 -0400)

committer Cloudwalk <cloudwalk009@gmail.com>

Mon, 17 Aug 2020 15:23:25 +0000 (11:23 -0400)
author Cloudwalk <cloudwalk009@gmail.com>
Mon, 17 Aug 2020 15:23:25 +0000 (11:23 -0400)
committer Cloudwalk <cloudwalk009@gmail.com>
Mon, 17 Aug 2020 15:23:25 +0000 (11:23 -0400)
diff --cc host.c
Simple merge
diff --cc model_brush.c
Simple merge
diff --cc progsvm.h
Simple merge
diff --cc prvm_edict.c
Simple merge
author	Cloudwalk <cloudwalk009@gmail.com>
	Mon, 17 Aug 2020 15:23:25 +0000 (11:23 -0400)
committer	Cloudwalk <cloudwalk009@gmail.com>
	Mon, 17 Aug 2020 15:23:25 +0000 (11:23 -0400)
		1	2
host.c	patch \|	diff1 \|	diff2 \|	blob \| history
model_brush.c	patch \|	diff1 \|	diff2 \|	blob \| history
progsvm.h	patch \|	diff1 \|	diff2 \|	blob \| history
prvm_edict.c	patch \|	diff1 \|	diff2 \|	blob \| history