Merge branch 'master' into bones_was_here/q3compat
authorbones_was_here <bones_was_here@xa.org.au>
Fri, 25 Sep 2020 11:34:16 +0000 (21:34 +1000)
committerbones_was_here <bones_was_here@xa.org.au>
Fri, 25 Sep 2020 11:34:16 +0000 (21:34 +1000)
commitdc02e4d78fb0e67b47a0c1e150b4c18c0711b8bf
tree62c178e37c8dc8a816d5dd2c8fc8b06d6b5468f0
parentfc6a7642cb0a75c7ae7e69701b8615d03dfa269e
parent4a69d131ab8541aaea1dac0b2129886d9d9f3827
Merge branch 'master' into bones_was_here/q3compat
qcsrc/server/client.qc
qcsrc/server/compat/quake3.qc
qcsrc/server/items/items.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/race.qc
qcsrc/server/world.qc