]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into mario/monsters
authorMario <mario.mario@y7mail.com>
Sun, 3 Mar 2013 21:30:21 +0000 (08:30 +1100)
committerMario <mario.mario@y7mail.com>
Sun, 3 Mar 2013 21:30:21 +0000 (08:30 +1100)
1  2 
commands.cfg
defaultXonotic.cfg

diff --cc commands.cfg
Simple merge
Simple merge