]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into Mario/monsters
authorMario <mario.mario@y7mail.com>
Wed, 28 Aug 2013 11:04:10 +0000 (21:04 +1000)
committerMario <mario.mario@y7mail.com>
Wed, 28 Aug 2013 11:04:10 +0000 (21:04 +1000)
1  2 
commands.cfg
defaultXonotic.cfg
qcsrc/server/command/sv_cmd.qc
qcsrc/server/g_world.qc

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