Merge branch 'master' into Mario/monsters
authorMario <mario@smbclan.net>
Sun, 21 Jul 2019 21:03:13 +0000 (07:03 +1000)
committerMario <mario@smbclan.net>
Sun, 21 Jul 2019 21:03:13 +0000 (07:03 +1000)
commit9677a6f1dd8dbca207cf972f8cfa3ca6a8e4820e
tree495a9784b03e9f8134e3f095259dc1a32d6bdc3b
parentf70b6498d323bf8ee9bbdc9fe413ac1fbf94ccd8
parent021728329f7609ccd73e24dfda4bd8ef36a482ae
Merge branch 'master' into Mario/monsters
qcsrc/client/csqcmodel_hooks.qc
qcsrc/common/turrets/sv_turrets.qc
qcsrc/common/turrets/sv_turrets.qh
qcsrc/menu/xonotic/util.qc
qcsrc/server/autocvars.qh
qcsrc/server/miscfunctions.qc