]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/custom_monster Mario/custom_monster
authorMario <mario@smbclan.net>
Tue, 4 Apr 2017 21:27:27 +0000 (07:27 +1000)
committerMario <mario@smbclan.net>
Tue, 4 Apr 2017 21:27:27 +0000 (07:27 +1000)
commit7e6acfe089ca264bf4a24d7e0bc8faba614b304e
treeda346aea116b654e6f6d6b586b44ccc092d0723c
parentbe37d1708f417701017f5551ad3ad06a2a0cd2a9
parentb6b68fad0ba8fb6901de0fcb14774b709696d8bc
Merge branch 'master' into Mario/custom_monster
qcsrc/common/monsters/sv_monsters.qc
qcsrc/server/client.qc