]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into terencehill/itemstime
authorterencehill <piuntn@gmail.com>
Mon, 18 Mar 2013 13:00:40 +0000 (14:00 +0100)
committerterencehill <piuntn@gmail.com>
Mon, 18 Mar 2013 13:00:40 +0000 (14:00 +0100)
commit99e4fa0264127dfcf4675d5f645061b51af815e4
treee60ab65c66c21946e2bc5b7254716f7dea6688c2
parent138e8a13857ec32c09da2335049b82d576736b47
parent489318817dc508e24f479090ddcf53ace10adbf0
Merge branch 'master' into terencehill/itemstime

Conflicts:
qcsrc/common/constants.qh
qcsrc/server/defs.qh
22 files changed:
_hud_common.cfg
_hud_descriptions.cfg
defaultXonotic.cfg
hud_luminos.cfg
hud_luminos_minimal.cfg
hud_luminos_minimal_xhair.cfg
hud_luminos_old.cfg
hud_nexuiz.cfg
qcsrc/client/autocvars.qh
qcsrc/client/hud.qc
qcsrc/client/hud.qh
qcsrc/client/hud_config.qc
qcsrc/client/waypointsprites.qc
qcsrc/common/constants.qh
qcsrc/common/util.qh
qcsrc/menu/classes.c
qcsrc/server/arena.qc
qcsrc/server/cl_client.qc
qcsrc/server/command/vote.qc
qcsrc/server/defs.qh
qcsrc/server/g_world.qc
qcsrc/server/t_items.qc