Merge branch 'master' into terencehill/keyhunt
authorterencehill <piuntn@gmail.com>
Sat, 31 Dec 2016 22:00:03 +0000 (23:00 +0100)
committerterencehill <piuntn@gmail.com>
Sat, 31 Dec 2016 22:00:03 +0000 (23:00 +0100)
1  2 
gamemodes.cfg
qcsrc/common/notifications/all.inc
qcsrc/server/mutators/mutator/gamemode_keyhunt.qc

diff --cc gamemodes.cfg
Simple merge
Simple merge