Merge remote branch 'origin/master' into divVerent/crypto2
authorRudolf Polzer <divverent@alientrap.org>
Thu, 23 Sep 2010 07:56:27 +0000 (09:56 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 23 Sep 2010 07:56:27 +0000 (09:56 +0200)
1  2 
defaultXonotic.cfg

Simple merge