Merge remote branch 'origin/fruitiex/fbfix'
authorRudolf Polzer <divverent@alientrap.org>
Thu, 18 Nov 2010 06:21:25 +0000 (07:21 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 18 Nov 2010 06:21:25 +0000 (07:21 +0100)
1  2 
defaultXonotic.cfg
qcsrc/server/g_world.qc

Simple merge
Simple merge