Merge remote branch 'refs/remotes/origin/fruitiex/conback'
authorRudolf Polzer <divverent@alientrap.org>
Thu, 29 Jul 2010 17:00:43 +0000 (19:00 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 29 Jul 2010 17:00:43 +0000 (19:00 +0200)
1  2 
defaultXonotic.cfg

Simple merge