]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divverent@xonotic.org>
Mon, 15 Aug 2011 18:10:44 +0000 (20:10 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Mon, 15 Aug 2011 18:10:44 +0000 (20:10 +0200)
1  2 
defaultXonotic.cfg

Simple merge