]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/monsters
authorMario <mario@smbclan.net>
Sat, 3 Feb 2018 15:45:20 +0000 (01:45 +1000)
committerMario <mario@smbclan.net>
Sat, 3 Feb 2018 15:45:20 +0000 (01:45 +1000)
commitf3c9d62b68cb415609dce698ec2fcd966b8c8ace
tree5a7ff93cfcf24665f6033694cf03d1c373111c04
parent7e96a48bcc582b387c95b65559f7a58f06784873
parentcf476b041e9004fb47e5fabac15ea751e5559d79
Merge branch 'master' into Mario/monsters
qcsrc/common/monsters/sv_monsters.qc
qcsrc/common/triggers/func/breakable.qc
qcsrc/server/autocvars.qh