Merge branch 'master' of /var/cache/git/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divverent@alientrap.org>
Tue, 3 Jan 2012 12:02:44 +0000 (13:02 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 3 Jan 2012 12:02:44 +0000 (13:02 +0100)
1  2 
defaultXonotic.cfg

Simple merge