Merge remote branch 'origin/master' into terencehill/centerprint_stuff
authorSamual <samual@xonotic.org>
Mon, 15 Aug 2011 06:41:17 +0000 (02:41 -0400)
committerSamual <samual@xonotic.org>
Mon, 15 Aug 2011 06:41:17 +0000 (02:41 -0400)
commitb5a593d8425521092f05949c4143d86a25d49f4c
treed460083c27496f4ef288a6f6f95bae99c582dfe6
parent22cb4c947fe09c39d4ff0a3cdb629225b92c5c5c
parent729d8931e8261ebce2ce18c7ef7e2709cbaf2293
Merge remote branch 'origin/master' into terencehill/centerprint_stuff
26 files changed:
_hud_descriptions.cfg
defaultXonotic.cfg
hud_luminos.cfg
hud_luminos_minimal.cfg
hud_luminos_old.cfg
hud_luminos_xhair_minimal.cfg
hud_nexuiz.cfg
qcsrc/client/Main.qc
qcsrc/client/View.qc
qcsrc/client/autocvars.qh
qcsrc/client/hud.qc
qcsrc/client/hud.qh
qcsrc/client/main.qh
qcsrc/client/miscfunctions.qc
qcsrc/client/scoreboard.qc
qcsrc/common/constants.qh
qcsrc/server/cl_client.qc
qcsrc/server/clientcommands.qc
qcsrc/server/ctf.qc
qcsrc/server/defs.qh
qcsrc/server/g_world.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/gamemode_keepaway.qc
qcsrc/server/t_items.qc
qcsrc/server/vote.qc
qcsrc/server/w_minstanex.qc