]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/monsters
authorMario <mario@smbclan.net>
Tue, 25 Sep 2018 07:01:16 +0000 (17:01 +1000)
committerMario <mario@smbclan.net>
Tue, 25 Sep 2018 07:01:16 +0000 (17:01 +1000)
commitdaaa815e35ec0cb95c8b5ae90e4dc8ff4bcf6eef
treee1931e2a271fefda825b08ca730341c3681963c3
parent145f8ff8d24f5fa56e513d79d4f186963baf2352
parentba2c014f1d2b6797359a1d5b63b67846c784ae2f
Merge branch 'master' into Mario/monsters
qcsrc/client/weapons/projectile.qc
qcsrc/common/monsters/monster/spider.qc
qcsrc/common/monsters/sv_monsters.qc
qcsrc/common/notifications/all.inc
qcsrc/common/turrets/sv_turrets.qc
qcsrc/server/autocvars.qh