]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into terencehill/newpanelhud-dom_points
authorFruitieX <rasse@rasse-laptop.(none)>
Tue, 26 Oct 2010 15:44:25 +0000 (18:44 +0300)
committerFruitieX <rasse@rasse-laptop.(none)>
Tue, 26 Oct 2010 15:44:25 +0000 (18:44 +0300)
commite862d0f2930f432932fed5ab8126c1e28ee118cb
treee3cf137cdfa0b531d7f107c767a624a0e4f1742a
parenta5e312f10db45ca50ce28c7cbc3bedaac5b2d75f
parent0ac1c629d686db49fe7b04700d358aa6588f74f8
Merge remote branch 'origin/master' into terencehill/newpanelhud-dom_points

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