]> 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@xonotic.org>
Tue, 31 Jan 2012 19:48:23 +0000 (20:48 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Tue, 31 Jan 2012 19:48:23 +0000 (20:48 +0100)
1  2 
defaultXonotic.cfg

Simple merge