]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'Mario/config_updates'
authorMario <zacjardine@y7mail.com>
Thu, 13 Nov 2014 14:08:26 +0000 (01:08 +1100)
committerMario <zacjardine@y7mail.com>
Thu, 13 Nov 2014 14:08:26 +0000 (01:08 +1100)
1  2 
defaultXonotic.cfg

Simple merge