]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into DefaultUser/kick_teamkiller
authorMario <mario@smbclan.net>
Sat, 25 Nov 2017 06:37:25 +0000 (16:37 +1000)
committerMario <mario@smbclan.net>
Sat, 25 Nov 2017 06:37:25 +0000 (16:37 +1000)
commit20b1203291c8a0592aee1bf4ada82cfe05305c4a
tree06315ee81737d2a6809dd7b6242259ba2bd9320b
parent2f0f4af21317e0b4a7961d93743e0ff2ef8e7d59
parent700861789922294ffa4b654a6683be45993240d1
Merge branch 'master' into DefaultUser/kick_teamkiller

# Conflicts:
# mutators.cfg
mutators.cfg
qcsrc/common/mutators/mutator/_mod.inc
qcsrc/common/mutators/mutator/_mod.qh
qcsrc/server/defs.qh