]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/weapons_fpsfix
authorMario <mario@smbclan.net>
Sat, 24 Feb 2018 12:19:42 +0000 (22:19 +1000)
committerMario <mario@smbclan.net>
Sat, 24 Feb 2018 12:19:42 +0000 (22:19 +1000)
commit73cf8f100c70465aa8a10680a2ca22841f5dcfdc
tree56edc5d4e605205ad476427f79a839307f5e1c2f
parent59fd18764ef9198b85e1b8914475963ad4bf963b
parent203216b3579c2ee41e7598eccc91e1dd2e0b487b
Merge branch 'master' into Mario/weapons_fpsfix

# Conflicts:
# qcsrc/common/weapons/all.qc
qcsrc/client/autocvars.qh
qcsrc/common/weapons/all.qc
qcsrc/common/weapons/weapon/hagar.qc
qcsrc/server/weapons/weaponsystem.qc
xonotic-client.cfg