Merge branch 'master' into Mario/monsters
authorMario <mario.mario@y7mail.com>
Wed, 21 Aug 2013 05:36:39 +0000 (15:36 +1000)
committerMario <mario.mario@y7mail.com>
Wed, 21 Aug 2013 05:36:39 +0000 (15:36 +1000)
1  2 
commands.cfg
defaultXonotic.cfg
qcsrc/server/autocvars.qh

diff --cc commands.cfg
Simple merge
Simple merge
Simple merge