Merge branch 'master' into Mario/minigames_merge
authorMario <zacjardine@y7mail.com>
Wed, 8 Jul 2015 14:25:06 +0000 (00:25 +1000)
committerMario <zacjardine@y7mail.com>
Wed, 8 Jul 2015 14:25:06 +0000 (00:25 +1000)
commitc6d440124df99b8b1f48fe7666332273535eb413
treeea079d102705da77f5876b87a2bd957472fe27a9
parenteff92d4aee25ebe31fe768af2b86c8bea80d1a51
parent8751feffa227c3d12ce6a7c957170726bbf79625
Merge branch 'master' into Mario/minigames_merge

Conflicts:
qcsrc/client/hud.qh
qcsrc/client/progs.src
qcsrc/client/scoreboard.qc
qcsrc/dpdefs/csprogsdefs.qh
qcsrc/server/cl_client.qc
qcsrc/server/cl_impulse.qc
qcsrc/server/g_tetris.qc
22 files changed:
defaultXonotic.cfg
qcsrc/client/command/cl_cmd.qc
qcsrc/client/hud.qc
qcsrc/client/hud.qh
qcsrc/client/hud_config.qc
qcsrc/client/hud_config.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.qh
qcsrc/common/minigames/cl_minigames_hud.qc
qcsrc/common/notifications.qc
qcsrc/common/notifications.qh
qcsrc/dpdefs/upstream/csprogsdefs.qc
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