]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/monsters
authorMario <zacjardine@y7mail.com>
Sun, 9 Sep 2018 12:44:26 +0000 (22:44 +1000)
committerMario <zacjardine@y7mail.com>
Sun, 9 Sep 2018 12:44:26 +0000 (22:44 +1000)
commit145f8ff8d24f5fa56e513d79d4f186963baf2352
treeb7a163c58b0977b12f096769c04fdeaa5e4975c1
parent59a213a4b63532b66162afad403b4969e15cca35
parent701b723907532d3e60e2a901b2e3dc5e1e8a5dd9
Merge branch 'master' into Mario/monsters
qcsrc/common/notifications/all.inc
qcsrc/common/turrets/sv_turrets.qc
qcsrc/server/autocvars.qh