]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/weapons_fpsfix
authorMario <mario@smbclan.net>
Thu, 14 Jun 2018 15:53:39 +0000 (01:53 +1000)
committerMario <mario@smbclan.net>
Thu, 14 Jun 2018 15:53:39 +0000 (01:53 +1000)
commita92318374023f7d811c2c931b794231275558ea0
tree481c559e11f421672f9e293a78523626c3e7a2b8
parent54f1f551aa7db52cb8f4d1c25df2e3a1ac86a429
parent81e5b9bf71122ef6392b2265a5cdd62c66cccfa5
Merge branch 'master' into Mario/weapons_fpsfix

# Conflicts:
# qcsrc/server/weapons/weaponsystem.qc
qcsrc/common/mutators/mutator/overkill/okhmg.qc
qcsrc/common/mutators/mutator/overkill/okmachinegun.qc
qcsrc/common/mutators/mutator/overkill/oknex.qc
qcsrc/common/mutators/mutator/overkill/okrpc.qc
qcsrc/common/mutators/mutator/overkill/okshotgun.qc
qcsrc/common/weapons/all.qh
qcsrc/server/weapons/weaponsystem.qc