Merge branch 'master' into Mario/stats_eloranking

author Mario <mario@smbclan.net>

Thu, 29 Aug 2019 04:44:42 +0000 (14:44 +1000)

committer Mario <mario@smbclan.net>

Thu, 29 Aug 2019 04:44:42 +0000 (14:44 +1000)
author Mario <mario@smbclan.net>
Thu, 29 Aug 2019 04:44:42 +0000 (14:44 +1000)
committer Mario <mario@smbclan.net>
Thu, 29 Aug 2019 04:44:42 +0000 (14:44 +1000)
diff --cc qcsrc/common/playerstats.qc
Simple merge
diff --cc qcsrc/server/defs.qh
Simple merge
diff --cc qcsrc/server/miscfunctions.qc
Simple merge
diff --cc xonotic-client.cfg
Simple merge
author	Mario <mario@smbclan.net>
	Thu, 29 Aug 2019 04:44:42 +0000 (14:44 +1000)
committer	Mario <mario@smbclan.net>
	Thu, 29 Aug 2019 04:44:42 +0000 (14:44 +1000)
		1	2
qcsrc/common/playerstats.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/defs.qh	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/miscfunctions.qc	patch \|	diff1 \|	diff2 \|	blob \| history
xonotic-client.cfg	patch \|	diff1 \|	diff2 \|	blob \| history