Merge branch 'master' into Mario/rifle_arena
authorMario <mario.mario@y7mail.com>
Wed, 5 Jun 2013 00:31:52 +0000 (10:31 +1000)
committerMario <mario.mario@y7mail.com>
Wed, 5 Jun 2013 00:31:52 +0000 (10:31 +1000)
commitec74997f484755f09e1f4b2d8dc0ba3dd5c0343d
treed8c05a10008d9b2339293192fa0dd794d74539a7
parent4addeeaa4a26b9482367dcb140a8909b7c2884d8
parentcfaacd5aff51c88ae76519d019aa6427ba1c5bc0
Merge branch 'master' into Mario/rifle_arena
defaultXonotic.cfg
qcsrc/server/autocvars.qh
qcsrc/server/mutators/mutator_dodging.qc