]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'Mario/melee_mutator' into Mario/mutators
authorMario <mario.mario@y7mail.com>
Thu, 6 Jun 2013 08:40:29 +0000 (18:40 +1000)
committerMario <mario.mario@y7mail.com>
Thu, 6 Jun 2013 08:40:29 +0000 (18:40 +1000)
commitabbead1a164088a600b14ac5d75df679d50de19b
tree5c354858383f38f60e9bfe894ea777fb0b3ca32e
parent15b437b2e18f0cfada1346d8bb7c29eb68943581
parent1522679654f92201855fb6d93934b2c85c84a6e8
Merge branch 'Mario/melee_mutator' into Mario/mutators
defaultXonotic.cfg
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/mutators.qh
qcsrc/server/progs.src