Merge branch 'fruitiex/newpanelhud_stable' into fruitiex/newpanelhud
authorFruitieX <rasse@rasse-lappy.localdomain>
Mon, 7 Jun 2010 17:29:41 +0000 (20:29 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Mon, 7 Jun 2010 17:29:41 +0000 (20:29 +0300)
commitb66a5a64ce256767913d7f5d48b540e7e1faca0f
tree7ad6f2e38f91df8c849f1edf4adef2bf050d4a9d
parent99cb391b8d83f0efdb2c9aeb7ccc50683dfd0b55
parent8c78880735116bcb4292a54041bbee4646464a3e
Merge branch 'fruitiex/newpanelhud_stable' into fruitiex/newpanelhud
defaultXonotic.cfg
qcsrc/client/Main.qc
qcsrc/client/hud.qc