]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/weapons_fpsfix
authorMario <zacjardine@y7mail.com>
Tue, 11 Sep 2018 22:06:29 +0000 (08:06 +1000)
committerMario <zacjardine@y7mail.com>
Tue, 11 Sep 2018 22:06:29 +0000 (08:06 +1000)
commitc2fb44193f57b4da2d053f4d7ce9cb388df52927
tree9c46d904b8d0e097e3d5a695b7bf918dfec4a136
parent9a214a1be6efc6b4c9eeac8c2e0c50dc5dda357c
parente89d31ad4b16d04f4938b367607b04997808b269
Merge branch 'master' into Mario/weapons_fpsfix
qcsrc/client/autocvars.qh
qcsrc/common/mutators/mutator/overkill/okrpc.qc
qcsrc/common/weapons/weapon/hagar.qc
qcsrc/server/weapons/weaponsystem.qc
xonotic-client.cfg