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/client/view.qc

12 files changed:

qcsrc/client/hud/hud.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/client/view.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/_all.inc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mutators/mutator/buffs/sv_buffs.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/t_items.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/vehicles/vehicle/racer.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/vehicles/vehicle/spiderbot.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/all.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/tuba.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/bot/default/havocbot/havocbot.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/client.qc	diff1 \|	diff2 \|	blob \| history