Merge branch 'master' into Mario/minigames_merge
authorMario <zacjardine@y7mail.com>
Mon, 24 Aug 2015 08:34:57 +0000 (18:34 +1000)
committerMario <zacjardine@y7mail.com>
Mon, 24 Aug 2015 08:34:57 +0000 (18:34 +1000)
commit2aed36e128f8f00da9c76f9e66baae89d5bb26b2
treea958a29fb5bf080d8654c978ae319309bd1f0a60
parentcaa6634e6d8d3fc8e264af28c2ccd070bbc05269
parent8f702ae20a0ba5fee40233c1fc8d3c03a60f982d
Merge branch 'master' into Mario/minigames_merge

# Conflicts:
# _hud_descriptions.cfg
# defaultXonotic.cfg
# qcsrc/client/hud.qh
# qcsrc/client/main.qc
# qcsrc/client/progs.src
# qcsrc/client/view.qc
# qcsrc/common/constants.qh
# qcsrc/common/notifications.qh
# qcsrc/server/autocvars.qh
# qcsrc/server/cl_client.qc
# qcsrc/server/progs.src
26 files changed:
_hud_descriptions.cfg
defaultXonotic.cfg
hud_luma.cfg
hud_luminos.cfg
hud_luminos_minimal.cfg
hud_luminos_minimal_xhair.cfg
hud_luminos_old.cfg
hud_nexuiz.cfg
qcsrc/client/command/cl_cmd.qc
qcsrc/client/hud.qc
qcsrc/client/hud.qh
qcsrc/client/main.qc
qcsrc/client/progs.src
qcsrc/client/scoreboard.qc
qcsrc/client/view.qc
qcsrc/common/constants.qh
qcsrc/common/minigames/cl_minigames.qc
qcsrc/common/minigames/sv_minigames.qc
qcsrc/common/notifications.qh
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/cl_impulse.qc
qcsrc/server/cl_player.qc
qcsrc/server/command/cmd.qc
qcsrc/server/g_world.qc
qcsrc/server/progs.src