Merge remote branch 'origin/terencehill/newpanelhud-dom_points' into terencehill...
authorFruitieX <fruitiex@gmail.com>
Wed, 15 Dec 2010 12:04:55 +0000 (14:04 +0200)
committerFruitieX <fruitiex@gmail.com>
Wed, 15 Dec 2010 12:04:55 +0000 (14:04 +0200)
commit2f2147a6c665f04d1b6e860dce8a8a093e7d2b9e
tree05eaae6623ae1a91743f08a5f9a11dd80f485fd0
parent3972e5deb9ba49a9ebbf9781a43b337b07d5a116
parent02d238e88f088f567092b524a09001bfcacc8d75
Merge remote branch 'origin/terencehill/newpanelhud-dom_points' into terencehill/newpanelhud

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