Merge branch 'master' into terencehill/newpanelhud
authorterencehill <piuntn@gmail.com>
Wed, 15 Dec 2010 23:09:08 +0000 (00:09 +0100)
committerterencehill <piuntn@gmail.com>
Wed, 15 Dec 2010 23:09:08 +0000 (00:09 +0100)
commit532bc664cec406e76fa496f8f0c682df17c27ff3
treec869b6547e75c626cbd6018a9794f1047d52b8c8
parent023819769f5fb5f829054d5f59066fca4382bdc6
parentdc431797a5f45a7b71e2e2f418ef5b8162fc77ad
Merge branch 'master' into terencehill/newpanelhud

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