Merge branch 'Mario/dpk_support' of gitlab.com:xonotic/darkplaces

author Cloudwalk <cloudwalk009@gmail.com>

Thu, 22 Jul 2021 01:47:14 +0000 (21:47 -0400)

committer Cloudwalk <cloudwalk009@gmail.com>

Thu, 22 Jul 2021 01:47:14 +0000 (21:47 -0400)
author Cloudwalk <cloudwalk009@gmail.com>
Thu, 22 Jul 2021 01:47:14 +0000 (21:47 -0400)
committer Cloudwalk <cloudwalk009@gmail.com>
Thu, 22 Jul 2021 01:47:14 +0000 (21:47 -0400)
diff --cc cl_parse.c
Simple merge
diff --cc fs.c
Simple merge
diff --cc sv_main.c
Simple merge
author	Cloudwalk <cloudwalk009@gmail.com>
	Thu, 22 Jul 2021 01:47:14 +0000 (21:47 -0400)
committer	Cloudwalk <cloudwalk009@gmail.com>
	Thu, 22 Jul 2021 01:47:14 +0000 (21:47 -0400)
		1	2
cl_parse.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs.c	patch \|	diff1 \|	diff2 \|	blob \| history
sv_main.c	patch \|	diff1 \|	diff2 \|	blob \| history