Merge branch 'master' into Mario/monsters
authorMario <mario.mario@y7mail.com>
Sun, 24 May 2020 16:46:18 +0000 (02:46 +1000)
committerMario <mario.mario@y7mail.com>
Sun, 24 May 2020 16:46:18 +0000 (02:46 +1000)
1  2 
qcsrc/client/csqcmodel_hooks.qc
qcsrc/common/notifications/all.inc
qcsrc/menu/xonotic/util.qc
qcsrc/server/autocvars.qh
qcsrc/server/g_world.qc
qcsrc/server/miscfunctions.qc

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge