Merge branch 'master' into martin-t/available
authorMartin Taibr <taibr.martin@gmail.com>
Sun, 25 Aug 2019 23:00:59 +0000 (01:00 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Sun, 25 Aug 2019 23:00:59 +0000 (01:00 +0200)
commit91bd86fc694af8c3555cc465d4d75250a8528b5e
tree2d410ea9e70ab16cd19def9abd62eb603a7601eb
parentf6e7de9c845f26f9c4f68ab2eb21d61e92fed2f1
parentfc89b93afec5495bdc74dbe1e63b24569aeaddfa
Merge branch 'master' into martin-t/available
gamemodes-server.cfg
qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc
qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qh
qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc
qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qh
qcsrc/common/stats.qh
qcsrc/server/miscfunctions.qc