]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into mario/domination_mutator
authorMario <mario.mario@y7mail.com>
Thu, 31 Jan 2013 10:40:55 +0000 (21:40 +1100)
committerMario <mario.mario@y7mail.com>
Thu, 31 Jan 2013 10:40:55 +0000 (21:40 +1100)
commitb49ceab1f3752842fa7d859e0b8e2677151164cc
treedc49febb9bcd4df531dd92acbb2afbd6d3fef569
parent78fd790dbb8690b148bd9270934b8e918a2fbc00
parent9c135628c252c5655c452c7143e14461391c7799
Merge branch 'master' into mario/domination_mutator
qcsrc/server/mutators/mutators.qh
qcsrc/server/progs.src