Resolve conflicts 1: Merge commit 'c58baab5' into bones_was_here/q3compat
authorbones_was_here <bones_was_here@xa.org.au>
Sun, 11 Jul 2021 10:21:33 +0000 (20:21 +1000)
committerbones_was_here <bones_was_here@xa.org.au>
Sun, 11 Jul 2021 10:21:33 +0000 (20:21 +1000)
commit39ff67006e98371c2961166ea52984024d9d3fab
treea8fffb3c5d49aed7e46f7b25087a07b461dabbea
parent3e6e644488b54b638078fb88b88c643e103ac8e1
parentc58baab5bd2dc4a77eb7d8e97824621d887c8e75
Resolve conflicts 1: Merge commit 'c58baab5' into bones_was_here/q3compat
19 files changed:
qcsrc/common/items/item.qh
qcsrc/common/mutators/mutator/buffs/all.inc
qcsrc/common/mutators/mutator/buffs/buffs.qh
qcsrc/common/mutators/mutator/buffs/sv_buffs.qc
qcsrc/common/mutators/mutator/buffs/sv_buffs.qh
qcsrc/common/stats.qh
qcsrc/common/weapons/all.qc
qcsrc/lib/spawnfunc.qh
qcsrc/lib/warpzone/common.qc
qcsrc/server/client.qc
qcsrc/server/compat/quake3.qc
qcsrc/server/items/items.qc
qcsrc/server/items/items.qh
qcsrc/server/main.qc
qcsrc/server/race.qc
qcsrc/server/teamplay.qc
qcsrc/server/teamplay.qh
qcsrc/server/world.qc
xonotic-server.cfg