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