Merge branch 'master' into terencehill/ca_arena_mutators
authorterencehill <piuntn@gmail.com>
Thu, 25 Apr 2013 10:25:57 +0000 (12:25 +0200)
committerterencehill <piuntn@gmail.com>
Thu, 25 Apr 2013 10:25:57 +0000 (12:25 +0200)
commit315ab0f2f959b04e5a10f2d98ab95656eab74ee3
tree4ea2d8f8ff65651fcf7f25eb1946e4f574cf76b8
parente33dcf5ea9dcdbcf166f9bee9fb4cd6cae9318cd
parent579290d658345d63f4bf28429e0af71c488084c8
Merge branch 'master' into terencehill/ca_arena_mutators

Conflicts:
qcsrc/client/announcer.qc
qcsrc/server/arena.qc
qcsrc/client/announcer.qc
qcsrc/common/constants.qh
qcsrc/common/notifications.qh
qcsrc/server/cl_client.qc
qcsrc/server/command/cmd.qc
qcsrc/server/command/vote.qc
qcsrc/server/defs.qh
qcsrc/server/g_damage.qc
qcsrc/server/g_world.qc
qcsrc/server/scores.qc
qcsrc/server/w_minstanex.qc