Merge branch 'master' into Lyberta/TeamplayOverhaul
authorLyberta <lyberta@lyberta.net>
Wed, 4 Apr 2018 16:44:14 +0000 (19:44 +0300)
committerLyberta <lyberta@lyberta.net>
Wed, 4 Apr 2018 16:44:14 +0000 (19:44 +0300)
1  2 
qcsrc/common/t_items.qc
qcsrc/server/defs.qh
qcsrc/server/mutators/events.qh
qcsrc/server/mutators/mutator/gamemode_assault.qc
qcsrc/server/mutators/mutator/gamemode_invasion.qc

Simple merge
Simple merge
Simple merge