Merge remote branch 'origin/master' into fruitiex/newpanelhud
authorFruitieX <rasse@rasse-lappy.localdomain>
Fri, 23 Jul 2010 23:04:27 +0000 (02:04 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Fri, 23 Jul 2010 23:04:27 +0000 (02:04 +0300)
commitbaa0f9610afb1e315c8dc067f50cf1521339aedd
treee52a0bdf58ffa4c04ff4e8453a851985ac8f324a
parent650fdb46cffc1f23fa4b0e5085993a6bc246e81a
parentc5da4e8d630ebc1c024ca30070583574a46252c2
Merge remote branch 'origin/master' into fruitiex/newpanelhud
defaultXonotic.cfg