Merge branch 'master' into Melanosuchus/minigames
authorMario <zacjardine@y7mail.com>
Sat, 25 Apr 2015 15:25:39 +0000 (01:25 +1000)
committerMario <zacjardine@y7mail.com>
Sat, 25 Apr 2015 15:25:39 +0000 (01:25 +1000)
commiteff92d4aee25ebe31fe768af2b86c8bea80d1a51
tree075b35510894b3b6d7fb09eb53307953de3fb050
parentbb39677b24abd8ba975139e1d1c7a59a2adef1b8
parentc8f42a86f88feeddfd5d80f58e0b5155b549b626
Merge branch 'master' into Melanosuchus/minigames

Conflicts:
qcsrc/server/autocvars.qh
qcsrc/client/hud.qc
qcsrc/client/main.qc
qcsrc/client/view.qc
qcsrc/common/notifications.qc
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc
qcsrc/server/g_world.qc