Merge branch 'Mario/playerdemo_removal'

author Mario <mario@smbclan.net>

Tue, 19 Jun 2018 01:34:10 +0000 (11:34 +1000)

committer Mario <mario@smbclan.net>

Tue, 19 Jun 2018 01:34:10 +0000 (11:34 +1000)
author Mario <mario@smbclan.net>
Tue, 19 Jun 2018 01:34:10 +0000 (11:34 +1000)
committer Mario <mario@smbclan.net>
Tue, 19 Jun 2018 01:34:10 +0000 (11:34 +1000)
diff --cc commands.cfg
Simple merge
diff --cc qcsrc/server/_mod.inc
Simple merge
diff --cc qcsrc/server/_mod.qh
Simple merge
diff --cc qcsrc/server/client.qc
Simple merge
diff --cc qcsrc/server/command/sv_cmd.qc
Simple merge
author	Mario <mario@smbclan.net>
	Tue, 19 Jun 2018 01:34:10 +0000 (11:34 +1000)
committer	Mario <mario@smbclan.net>
	Tue, 19 Jun 2018 01:34:10 +0000 (11:34 +1000)
		1	2
commands.cfg	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/_mod.inc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/_mod.qh	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/client.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/command/sv_cmd.qc	patch \|	diff1 \|	diff2 \|	blob \| history