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)
commit629f6f3b55e891281bb265f8022d129d313c110f
tree223126a2262851754fb04c41a5ff699e8c23d15e
parent0ae17929fade051984a1c76e49f86f36263e79b1
parent7f08a396e92c71a2baf9aca2fdba9ca60d6137c0
Merge branch 'master' into martin-t/AMMO
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