Merge branch 'master' into martin-t/limit
authorMartin Taibr <taibr.martin@gmail.com>
Thu, 26 Mar 2020 14:19:14 +0000 (15:19 +0100)
committerMartin Taibr <taibr.martin@gmail.com>
Thu, 26 Mar 2020 14:19:14 +0000 (15:19 +0100)
commit016835f8f51aff29719995f8d080d9c1b19392c4
treeafee5acfa72bd8d251ea191dd9b6f3c72f6e618a
parent8368a96ecebd267d92620f6f049a166e5b692c87
parent71ca250560647dc35300f560a2cb1ac933c7826a
Merge branch 'master' into martin-t/limit
qcsrc/server/defs.qh
qcsrc/server/g_world.qc