Merge branch 'master' into Cloudwalk/32bitprogs

author Cloudwalk <cloudwalk009@gmail.com>

Tue, 21 Jul 2020 16:45:52 +0000 (12:45 -0400)

committer Cloudwalk <cloudwalk009@gmail.com>

Tue, 21 Jul 2020 16:45:52 +0000 (12:45 -0400)
author Cloudwalk <cloudwalk009@gmail.com>
Tue, 21 Jul 2020 16:45:52 +0000 (12:45 -0400)
committer Cloudwalk <cloudwalk009@gmail.com>
Tue, 21 Jul 2020 16:45:52 +0000 (12:45 -0400)
diff --cc makefile
Simple merge
diff --cc prvm_edict.c
Simple merge
diff --cc prvm_execprogram.h
Simple merge
author	Cloudwalk <cloudwalk009@gmail.com>
	Tue, 21 Jul 2020 16:45:52 +0000 (12:45 -0400)
committer	Cloudwalk <cloudwalk009@gmail.com>
	Tue, 21 Jul 2020 16:45:52 +0000 (12:45 -0400)
		1	2
makefile	patch \|	diff1 \|	diff2 \|	blob \| history
prvm_edict.c	patch \|	diff1 \|	diff2 \|	blob \| history
prvm_execprogram.h	patch \|	diff1 \|	diff2 \|	blob \| history