Merge branch 'fruitiex/newpanelhud' into fruitiex/fruitbalance
authorFruitieX <rasse@rasse-lappy.localdomain>
Sat, 24 Jul 2010 11:15:49 +0000 (14:15 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Sat, 24 Jul 2010 11:15:49 +0000 (14:15 +0300)
1  2 
defaultXonotic.cfg
qcsrc/client/View.qc
qcsrc/common/constants.qh
qcsrc/server/g_damage.qc

Simple merge
Simple merge
Simple merge
Simple merge