Merge branch 'master' into Lyberta/GamemodesSplit 578/head
authorLyberta <lyberta@lyberta.net>
Tue, 21 Aug 2018 07:35:05 +0000 (10:35 +0300)
committerLyberta <lyberta@lyberta.net>
Tue, 21 Aug 2018 07:35:05 +0000 (10:35 +0300)
commitb06d3ad205f9865b7b3d7d5c97257f7802db5400
tree59f80650e13e8dd9c418e5ac3c09e3b7ca662274
parent5a777777c509053f4b6b132168fbef5044892200
parent2a295e36ce93f87f6342b4bd0cdaebcc7faa69da
Merge branch 'master' into Lyberta/GamemodesSplit
qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc
qcsrc/common/gamemodes/gamemode/domination/sv_domination.qc
qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc
qcsrc/common/gamemodes/gamemode/keepaway/sv_keepaway.qc
qcsrc/common/gamemodes/gamemode/keepaway/sv_keepaway.qh