Merge branch 'master' into Mario/stats_eloranking
authorMario <mario@smbclan.net>
Thu, 29 Aug 2019 04:44:42 +0000 (14:44 +1000)
committerMario <mario@smbclan.net>
Thu, 29 Aug 2019 04:44:42 +0000 (14:44 +1000)
1  2 
qcsrc/common/playerstats.qc
qcsrc/server/defs.qh
qcsrc/server/miscfunctions.qc
xonotic-client.cfg

Simple merge
Simple merge
Simple merge
Simple merge