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)
commit544daa665f16f82cadc26e7d42241987fa4f7f00
treec4c78de0d38df7787566b01be2346d45f4d5d867
parentba7b3e1f1b0734fe596b8588e115f49a34f01ce1
parentc6edebc74c718bccb7d70b52637c8b08fa69465f
Merge branch 'master' into Mario/xonoticless_fix
qcsrc/lib/warpzone/server.qc
qcsrc/server/client.qc