Merge branch 'master' into terencehill/newpanelhud
authorterencehill <piuntn@gmail.com>
Sat, 25 Dec 2010 15:07:54 +0000 (16:07 +0100)
committerterencehill <piuntn@gmail.com>
Sat, 25 Dec 2010 15:07:54 +0000 (16:07 +0100)
commit9971f28f796f51a9c05702a9d4ae382e4e4f0796
treedac97b0a55bdec042f858e22d131b454010be22d
parent4ed78b658e8888d30bf430095028f7a544bb412f
parent0f2df14011885d71fabc7f6c8650dfadd1692bca
Merge branch 'master' into terencehill/newpanelhud

Conflicts:
qcsrc/client/hud.qc
qcsrc/server/cl_client.qc
defaultXonotic.cfg
qcsrc/client/Main.qc
qcsrc/client/hud.qc
qcsrc/client/hud.qh
qcsrc/client/miscfunctions.qc
qcsrc/client/scoreboard.qc
qcsrc/server/cl_client.qc