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)
commitb46fdcee5c729ccdf485d908803d06bbfdac2a8c
treefdd792680145a5edc67501328c9da00b96603c95
parent75d091069d041dee686497e8b88df51595689a06
parent5ac3c3d06950a44119698d6ab95464e95f78cf40
Merge branch 'fruitiex/newpanelhud' into fruitiex/fruitbalance
defaultXonotic.cfg
qcsrc/client/View.qc
qcsrc/common/constants.qh
qcsrc/server/g_damage.qc