Merge branch 'master' into terencehill/newpanelhud
authorFruitieX <fruitiex@gmail.com>
Wed, 15 Dec 2010 11:50:53 +0000 (13:50 +0200)
committerFruitieX <fruitiex@gmail.com>
Wed, 15 Dec 2010 11:50:53 +0000 (13:50 +0200)
commit3972e5deb9ba49a9ebbf9781a43b337b07d5a116
treed5298cda88661ebba196c9866cea3729ad159175
parent9bf601b5dff8f3fc15acc66b2e7e8813eb6e3420
parent99532b575871f692c9eb5541d56bb51b8ac71146
Merge branch 'master' into terencehill/newpanelhud

Conflicts:
qcsrc/client/scoreboard.qc
_hud_descriptions.cfg
defaultXonotic.cfg
hud_luminos.cfg
hud_nexuiz.cfg
qcsrc/client/hud.qc
qcsrc/client/scoreboard.qc
qcsrc/common/util.qh