Merge branch 'master' into fruitiex/newpanelhud_stable
authorFruitieX <rasse@rasse-lappy.localdomain>
Thu, 22 Jul 2010 16:55:43 +0000 (19:55 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Thu, 22 Jul 2010 16:55:43 +0000 (19:55 +0300)
commitbacf7fa8ed11dd72c3bc9f01efced83004237d01
tree748402da9f7a57030a279d2a2f919fd871a95933
parent3dc4bb934f79bf6f7e989d031ce8af9b0d5a2db9
parent58f3211a938e0c2d2d26fe834f967c746fcc8754
Merge branch 'master' into fruitiex/newpanelhud_stable
defaultXonotic.cfg