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

]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit - qcsrc/common/weapons/w_crylink.qc

Merge branch 'master' into Mario/sound_model_paths

# Conflicts:
# qcsrc/common/items/item/powerup.qc

qcsrc/common/items/item/armor.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/items/item/health.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/items/item/jetpack.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/items/item/powerup.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/t_items.qc	diff1 \|	diff2 \|	blob \| history