Merge branch 'master' into fruitiex/newpanelhud
authorFruitieX <rasse@rasse-lappy.localdomain>
Wed, 7 Jul 2010 12:29:13 +0000 (15:29 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Wed, 7 Jul 2010 12:29:13 +0000 (15:29 +0300)
commit6701ba40024db6ca89585abfc9f091bada9c7992
treee6137520ffea96a9ce42f799d87dca9d99597437
parent5504c4d4e8719ba6fd4f79fe5ddffd6e9f4107e2
parent7f5b01d9a5483027bf93505c17e8842da5674792
Merge branch 'master' into fruitiex/newpanelhud
defaultXonotic.cfg
qcsrc/client/Main.qc
qcsrc/client/View.qc