Merge branch 'Mario/dpk_support' of gitlab.com:xonotic/darkplaces
authorCloudwalk <cloudwalk009@gmail.com>
Thu, 22 Jul 2021 01:47:14 +0000 (21:47 -0400)
committerCloudwalk <cloudwalk009@gmail.com>
Thu, 22 Jul 2021 01:47:14 +0000 (21:47 -0400)
1  2 
cl_parse.c
fs.c
sv_main.c

diff --cc cl_parse.c
Simple merge
diff --cc fs.c
Simple merge
diff --cc sv_main.c
Simple merge