]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divverent@alientrap.org>
Fri, 20 Jan 2012 16:17:25 +0000 (17:17 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 20 Jan 2012 16:17:25 +0000 (17:17 +0100)
1  2 
defaultXonotic.cfg

Simple merge