Merge branch 'master' into Lyberta/TeamplayOverhaul
authorLyberta <lyberta@lyberta.net>
Sun, 8 Apr 2018 22:18:20 +0000 (01:18 +0300)
committerLyberta <lyberta@lyberta.net>
Sun, 8 Apr 2018 22:18:20 +0000 (01:18 +0300)
commitff169c9d675521c4e05efe123024cf9703fd4984
treecb9d83031b8c4903f8b2760365887a7a124560d1
parent60daabe099ac61a7e64be0aa5065a185d78f2e64
parent49dd3844a37bb91e3c48654dead867b15ce94638
Merge branch 'master' into Lyberta/TeamplayOverhaul
qcsrc/common/t_items.qc
qcsrc/server/bot/default/bot.qc
qcsrc/server/client.qc
qcsrc/server/command/cmd.qc
qcsrc/server/g_world.qc
qcsrc/server/mutators/events.qh
qcsrc/server/mutators/mutator/gamemode_ctf.qc
qcsrc/server/mutators/mutator/gamemode_race.qc