Merge branch 'master' into fruitiex/newpanelhud
authorFruitieX <rasse@rasse-lappy.localdomain>
Sun, 6 Jun 2010 13:55:08 +0000 (16:55 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Sun, 6 Jun 2010 13:55:08 +0000 (16:55 +0300)
commit99cb391b8d83f0efdb2c9aeb7ccc50683dfd0b55
tree2778c702133d8de303111b583df9e712f08ba76a
parent18e9965b8e9960d8f20a0d29a581c553ee901f7f
parentf54d799f3e6e3f31b7d685453156bb7f0e448ce1
Merge branch 'master' into fruitiex/newpanelhud

Conflicts:
qcsrc/common/constants.qh
qcsrc/client/hud.qc
qcsrc/client/progs.src
qcsrc/common/constants.qh
qcsrc/server/g_damage.qc