Merge branch 'master' into fruitiex/newpanelhud_stable
authorFruitieX <rasse@rasse-lappy.localdomain>
Tue, 15 Jun 2010 11:00:57 +0000 (14:00 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Tue, 15 Jun 2010 11:00:57 +0000 (14:00 +0300)
commit6818906d7cf84d2bc8f0236058f0cefc10966e4a
tree5efd65e524767d6e049a4de763a4705cc478336d
parent8c746469255d44c93f16bfbd52784b936f66023e
parent772a1a71f8b0d4a1ea41b4db28bcdda0708d7da5
Merge branch 'master' into fruitiex/newpanelhud_stable
defaultXonotic.cfg