]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge remote branch 'origin/terencehill/misc_bugfixes'
authorRudolf Polzer <divVerent@xonotic.org>
Sat, 19 Mar 2011 07:46:31 +0000 (08:46 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Sat, 19 Mar 2011 07:46:31 +0000 (08:46 +0100)
1  2 
defaultXonotic.cfg

Simple merge