]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into mand1nga/bot-debug
authormand1nga <mand1nga@xonotic.org>
Wed, 20 Apr 2011 05:28:02 +0000 (02:28 -0300)
committermand1nga <mand1nga@xonotic.org>
Wed, 20 Apr 2011 05:28:02 +0000 (02:28 -0300)
1  2 
defaultXonotic.cfg

Simple merge