Merge branch 'master' into martin-t/AMMO
authorMartin Taibr <taibr.martin@gmail.com>
Sun, 1 Sep 2019 14:03:14 +0000 (16:03 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Sun, 1 Sep 2019 14:03:14 +0000 (16:03 +0200)
1  2 
qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc
qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc
qcsrc/common/gamemodes/gamemode/lms/sv_lms.qc
qcsrc/common/t_items.qc
qcsrc/server/miscfunctions.qc
xonotic-server.cfg

Simple merge
Simple merge
Simple merge