]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into mand1nga/bot-fixes-II
authormand1nga <mand1nga@xonotic.org>
Tue, 23 Aug 2011 22:23:30 +0000 (19:23 -0300)
committermand1nga <mand1nga@xonotic.org>
Tue, 23 Aug 2011 22:23:30 +0000 (19:23 -0300)
1  2 
defaultXonotic.cfg

Simple merge