Merge branch 'master' into Lyberta/StandaloneOverkillWeapons

author Mario <mario@smbclan.net>

Thu, 31 May 2018 05:34:01 +0000 (15:34 +1000)

committer Mario <mario@smbclan.net>

Thu, 31 May 2018 05:34:01 +0000 (15:34 +1000)
author Mario <mario@smbclan.net>
Thu, 31 May 2018 05:34:01 +0000 (15:34 +1000)
committer Mario <mario@smbclan.net>
Thu, 31 May 2018 05:34:01 +0000 (15:34 +1000)
diff --cc bal-wep-xonotic.cfg
Simple merge
diff --cc qcsrc/server/client.qc
Simple merge
diff --cc xonotic-client.cfg
Simple merge
diff --cc xonotic-server.cfg
Simple merge
author	Mario <mario@smbclan.net>
	Thu, 31 May 2018 05:34:01 +0000 (15:34 +1000)
committer	Mario <mario@smbclan.net>
	Thu, 31 May 2018 05:34:01 +0000 (15:34 +1000)
		1	2
bal-wep-xonotic.cfg	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/client.qc	patch \|	diff1 \|	diff2 \|	blob \| history
xonotic-client.cfg	patch \|	diff1 \|	diff2 \|	blob \| history
xonotic-server.cfg	patch \|	diff1 \|	diff2 \|	blob \| history