Merge branch 'master' into Mario/teams_bitflag 335/head
authorMario <mario@smbclan.net>
Wed, 13 Jul 2016 09:05:20 +0000 (19:05 +1000)
committerMario <mario@smbclan.net>
Wed, 13 Jul 2016 09:05:20 +0000 (19:05 +1000)
1  2 
qcsrc/server/cl_client.qc

Simple merge