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/weapons_fpsfix

# Conflicts:
# defaultXonotic.cfg
# qcsrc/client/autocvars.qh
# qcsrc/server/weapons/weaponsystem.qc

defaultClient.cfg	\|	diff2 \|	blob \| history
qcsrc/client/autocvars.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/models/all.inc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/all.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/hagar.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/weapons/weaponsystem.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/weapons/weaponsystem.qh	diff1 \|	diff2 \|	blob \| history