Merge branch 'master' into Mario/mutators
authorMario <mario.mario@y7mail.com>
Fri, 12 Jul 2013 00:04:10 +0000 (10:04 +1000)
committerMario <mario.mario@y7mail.com>
Fri, 12 Jul 2013 00:04:10 +0000 (10:04 +1000)
commita00d7aad132a38ac48dc4a1cd0c49aa829a0b850
treeda26e8427bad838a279e658d743e7986a40d303c
parent65124abcc210757dd9e6cd7e4cf4c7c9eb734dc6
parent0031d67392b186b59957ab98309935c10f93de02
Merge branch 'master' into Mario/mutators
defaultXonotic.cfg
qcsrc/server/miscfunctions.qc