Merge remote branch 'origin/terencehill/misc_bugfixes'
authorRudolf Polzer <divVerent@xonotic.org>
Wed, 9 Mar 2011 11:48:02 +0000 (12:48 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Wed, 9 Mar 2011 11:48:02 +0000 (12:48 +0100)
1  2 
defaultXonotic.cfg
qcsrc/server/g_world.qc

Simple merge
Simple merge