Merge branch 'master' into Mario/showspecs
authorMario <mario@smbclan.net>
Tue, 14 Jun 2016 14:04:21 +0000 (00:04 +1000)
committerMario <mario@smbclan.net>
Tue, 14 Jun 2016 14:04:21 +0000 (00:04 +1000)
commit8e0690ba978a6a0c7287bc3cfa2873a05b15fc5f
tree5e7603b3e5492244358f0ab2831e12a445a4244e
parenteac60648c4017e495060dd3ba9e50ac4bad5000a
parent49260b6ae3d0ffae7f73abe2da1d8a35859b162d
Merge branch 'master' into Mario/showspecs
qcsrc/client/main.qc
qcsrc/server/cl_client.qc