Merge branch 'master' into fruitiex/newpanelhud
authorFruitieX <rasse@rasse-lappy.localdomain>
Sun, 11 Jul 2010 00:19:15 +0000 (03:19 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Sun, 11 Jul 2010 00:19:15 +0000 (03:19 +0300)
commit070d139d5e21264d1ac91a6c96631c933f092861
treed59784a1b56dceb8dee26065931e2be3bbd721a2
parent0a9b18bc4d48ef58f95abcb7017ce93cdde64d91
parentf66615b722a8527aecfa7a6f2a74bb55204fb16b
Merge branch 'master' into fruitiex/newpanelhud
defaultXonotic.cfg