Merge remote branch 'origin/master' into fruitiex/newpanelhud
authorFruitieX <rasse@rasse-lappy.localdomain>
Sun, 15 Aug 2010 08:45:01 +0000 (11:45 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Sun, 15 Aug 2010 08:45:01 +0000 (11:45 +0300)
commitf536d182b06173bac130d0e77dfcf25833641504
tree102119c80de22ef43c9682fe74ba62a64d97fa66
parent06f163284faddd0c1e8d66e198eba4771e3ea2f8
parenta1cf195895e07d2e9fd6dfdfb75123face0ae60b
Merge remote branch 'origin/master' into fruitiex/newpanelhud
defaultXonotic.cfg