]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/monsters
authorMario <mario@smbclan.net>
Mon, 23 Apr 2018 16:16:41 +0000 (02:16 +1000)
committerMario <mario@smbclan.net>
Mon, 23 Apr 2018 16:16:41 +0000 (02:16 +1000)
commite259123719e072470e8fd479ffaf4d33f02cea2e
tree0184042e9e340ff4344d8d6f4d105892812343ad
parent58491bb25833ac8ac6d3045e05027129309fda59
parent64abbe49fae92a9447d440eab3f705d6dbf9194e
Merge branch 'master' into Mario/monsters
qcsrc/common/monsters/monster/mage.qc
qcsrc/common/monsters/monster/wyvern.qc
qcsrc/common/monsters/sv_monsters.qc
qcsrc/menu/xonotic/util.qc
qcsrc/server/autocvars.qh