Merge branch 'master' into Mario/showspecs
authorMario <mario@smbclan.net>
Thu, 21 Jul 2016 16:21:06 +0000 (02:21 +1000)
committerMario <mario@smbclan.net>
Thu, 21 Jul 2016 16:21:06 +0000 (02:21 +1000)
commitc6ebaefab2aca7df4648dac3ccdd4b52de45d0ed
tree22c71c04afa0d148cb4988ab5dda0da951bff31e
parent8e0690ba978a6a0c7287bc3cfa2873a05b15fc5f
parentfcb813d8750c28970c06ebe92281729d20d776d6
Merge branch 'master' into Mario/showspecs
defaultXonotic.cfg
qcsrc/client/autocvars.qh
qcsrc/client/main.qc
qcsrc/client/main.qh
qcsrc/server/cl_client.qc