Merge branch 'master' into Mario/xonoticless_fix
authorMario <mario@smbclan.net>
Mon, 24 Oct 2016 22:59:40 +0000 (08:59 +1000)
committerMario <mario@smbclan.net>
Mon, 24 Oct 2016 22:59:40 +0000 (08:59 +1000)
1  2 
qcsrc/lib/warpzone/server.qc
qcsrc/server/client.qc

Simple merge
Simple merge