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)
commit195d267efd270e8d9ff9b4565f67d5aa4dc7681f
tree56652bb8a67977cb9918d5212a7ff459af19fd25
parenta2cf7e7e2aa2fe1ed7546e13b543ceab6b85ff30
parent71636e8f68cd31db1aabb442259a11c3bb3b3866
Merge branch 'master' into Lyberta/TeamplayOverhaul
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