]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge remote-tracking branch 'origin/samual/shownames_fixes'
authormand1nga <mand1nga@xonotic.org>
Thu, 1 Sep 2011 03:05:39 +0000 (00:05 -0300)
committermand1nga <mand1nga@xonotic.org>
Thu, 1 Sep 2011 03:05:39 +0000 (00:05 -0300)
1  2 
defaultXonotic.cfg

Simple merge