]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divVerent@xonotic.org>
Mon, 23 May 2011 15:44:42 +0000 (17:44 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Mon, 23 May 2011 15:44:42 +0000 (17:44 +0200)
1  2 
defaultXonotic.cfg

Simple merge