de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit - qcsrc/common/mutators/mutator/overkill/okshotgun.qc

]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit - qcsrc/common/mutators/mutator/overkill/okshotgun.qc

Merge branch 'master' into Mario/monsters

# Conflicts:
# qcsrc/menu/xonotic/util.qc

qcsrc/client/csqcmodel_hooks.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/sv_monsters.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/turrets/sv_turrets.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/xonotic/util.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/autocvars.qh	diff1 \|	diff2 \|	blob \| history