Merge branch 'master' into terencehill/newpanelhud
authorterencehill <piuntn@gmail.com>
Sat, 19 Mar 2011 22:57:17 +0000 (23:57 +0100)
committerterencehill <piuntn@gmail.com>
Sat, 19 Mar 2011 22:57:17 +0000 (23:57 +0100)
commit9cdc5ecff03fff6fe2feef2341a33806aa110a97
treec9bbb9112c6dfac6a6a301020822bbdae264e6f1
parent2551d9046e84ed9d6760f09cb575b87ce62df19b
parent6b07ce93d47ba8a1cb8da73e8323be5a7ae200db
Merge branch 'master' into terencehill/newpanelhud

Conflicts:
qcsrc/client/hud.qc
defaultXonotic.cfg
qcsrc/client/Defs.qc
qcsrc/client/Main.qc
qcsrc/client/View.qc
qcsrc/client/autocvars.qh
qcsrc/client/hud.qc
qcsrc/common/constants.qh
qcsrc/server/cl_client.qc
tooltips.db