Merge branch 'master' into Cloudwalk/protocol_redesign

author Cloudwalk <cloudwalk009@gmail.com>

Thu, 8 Oct 2020 12:58:02 +0000 (08:58 -0400)

committer Cloudwalk <cloudwalk009@gmail.com>

Thu, 8 Oct 2020 12:58:02 +0000 (08:58 -0400)
author Cloudwalk <cloudwalk009@gmail.com>
Thu, 8 Oct 2020 12:58:02 +0000 (08:58 -0400)
committer Cloudwalk <cloudwalk009@gmail.com>
Thu, 8 Oct 2020 12:58:02 +0000 (08:58 -0400)
diff --cc netconn.c
Simple merge
diff --cc server.h
Simple merge
diff --cc sv_main.c
Simple merge
author	Cloudwalk <cloudwalk009@gmail.com>
	Thu, 8 Oct 2020 12:58:02 +0000 (08:58 -0400)
committer	Cloudwalk <cloudwalk009@gmail.com>
	Thu, 8 Oct 2020 12:58:02 +0000 (08:58 -0400)
		1	2
netconn.c	patch \|	diff1 \|	diff2 \|	blob \| history
server.h	patch \|	diff1 \|	diff2 \|	blob \| history
sv_main.c	patch \|	diff1 \|	diff2 \|	blob \| history