]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into nyov/dedicated-startupscreen
authornyov <nyov@nexnode.net>
Sat, 3 Dec 2011 19:16:14 +0000 (20:16 +0100)
committernyov <nyov@nexnode.net>
Sat, 3 Dec 2011 19:16:14 +0000 (20:16 +0100)
1  2 
defaultXonotic.cfg

Simple merge