]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' of /var/cache/git/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divverent@alientrap.org>
Mon, 19 Dec 2011 11:59:33 +0000 (12:59 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Mon, 19 Dec 2011 11:59:33 +0000 (12:59 +0100)
1  2 
defaultXonotic.cfg

Simple merge