Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divVerent@xonotic.org>
Mon, 6 Dec 2010 08:42:02 +0000 (09:42 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Mon, 6 Dec 2010 08:42:02 +0000 (09:42 +0100)
1  2 
defaultXonotic.cfg

Simple merge