Merge branch 'master' into terencehill/newpanelhud-dom_points
authorterencehill <piuntn@gmail.com>
Wed, 20 Oct 2010 22:09:40 +0000 (00:09 +0200)
committerterencehill <piuntn@gmail.com>
Wed, 20 Oct 2010 22:09:40 +0000 (00:09 +0200)
commit81046f42baf4ec980a069a5e9ba88b1e5fc7f2c9
treee61951b2cb09727b66105604075af528e58c1f34
parent0e42b83ff46744f9c313e2a7aa9706885a44ce38
parentd3bd5ddddada8dda32a45b8d4cabcfacc9fd685f
Merge branch 'master' into terencehill/newpanelhud-dom_points

Conflicts:
qcsrc/server/cl_client.qc
defaultXonotic.cfg
qcsrc/client/hud.qc
qcsrc/common/constants.qh
qcsrc/server/cl_client.qc
qcsrc/server/domination.qc