Merge branch 'master' into Lyberta/PrintMove
authorMario <mario@smbclan.net>
Mon, 11 Jun 2018 07:48:10 +0000 (17:48 +1000)
committerMario <mario@smbclan.net>
Mon, 11 Jun 2018 07:48:10 +0000 (17:48 +1000)
1  2 
qcsrc/server/client.qc
qcsrc/server/player.qc

Simple merge
Simple merge