Merge branch 'master' into terencehill/gameover_stuff
authorMario <mario@smbclan.net>
Mon, 17 Oct 2016 13:43:14 +0000 (23:43 +1000)
committerMario <mario@smbclan.net>
Mon, 17 Oct 2016 13:43:14 +0000 (23:43 +1000)
# Conflicts:
# notifications.cfg

1  2 
notifications.cfg
qcsrc/common/mutators/mutator/nix/sv_nix.qc
qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
qcsrc/common/notifications/all.inc
qcsrc/common/stats.qh
qcsrc/server/bot/default/bot.qc
qcsrc/server/client.qc
qcsrc/server/defs.qh
qcsrc/server/g_world.qc

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge