]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/monsters
authorMario <mario.mario@y7mail.com>
Fri, 3 Apr 2020 18:43:29 +0000 (04:43 +1000)
committerMario <mario.mario@y7mail.com>
Fri, 3 Apr 2020 18:43:29 +0000 (04:43 +1000)
commitaa5a713b068b4e4b4ecd2ca69bd375e20c7b4237
tree338d5b7192c0e1e6e2762d02cd77476a3e4a3c28
parentfe65404b4515e2f7db18a71c9953f318003b214e
parent7ff0571096c4be4b74a9aeb3f7fa08a08ce1942c
Merge branch 'master' into Mario/monsters
qcsrc/common/notifications/all.inc
qcsrc/common/turrets/sv_turrets.qc
qcsrc/server/g_world.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/miscfunctions.qh