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)
commit922354d1191d534b0b12516e28561bc70cbe2a87
tree7878a5ecd5c63ec36fa04252b548ad00657c804e
parent3a924ae34b70e77e6118217a02fdd6d65dafbb0d
parentfcc886a800da11731d4b0f576e14b21558b65b5c
Merge branch 'master' into terencehill/gameover_stuff

# Conflicts:
# notifications.cfg
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