]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge remote-tracking branch 'origin/terencehill/cvar_desc'
authorRudolf Polzer <divverent@xonotic.org>
Sat, 27 Aug 2011 14:08:08 +0000 (16:08 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Sat, 27 Aug 2011 14:08:08 +0000 (16:08 +0200)
1  2 
defaultXonotic.cfg

Simple merge