Merge branch 'master' into Lyberta/TeamplayOverhaul
authorLyberta <lyberta@lyberta.net>
Fri, 15 Jun 2018 04:51:33 +0000 (07:51 +0300)
committerLyberta <lyberta@lyberta.net>
Fri, 15 Jun 2018 04:51:33 +0000 (07:51 +0300)
commit13832240e226eba119844d7bd02ca51b617e586a
treedcb9f71101d571c15d59a4e0106088a6b5855241
parent16bb4a51347c40ae0655bba054bc7cf201538e45
parent81e5b9bf71122ef6392b2265a5cdd62c66cccfa5
Merge branch 'master' into Lyberta/TeamplayOverhaul
qcsrc/common/gamemodes/gamemode/ctf/ctf.qc
qcsrc/server/client.qc
qcsrc/server/command/cmd.qc
qcsrc/server/command/sv_cmd.qc
qcsrc/server/g_world.qc
qcsrc/server/g_world.qh
qcsrc/server/mutators/events.qh