git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit

]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit

Merge branch 'master' into Mario/wepent_experimental

# Conflicts:
# qcsrc/common/mutators/mutator/overkill/sv_overkill.qc

qcsrc/common/mutators/mutator/buffs/sv_buffs.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mutators/mutator/overkill/sv_overkill.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/t_items.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/crylink.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/client.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/events.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/player.qc	diff1 \|	diff2 \|	blob \| history