]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/weapons_fpsfix Mario/weapons_fpsfix
authorMario <mario@smbclan.net>
Sun, 30 Sep 2018 12:50:42 +0000 (22:50 +1000)
committerMario <mario@smbclan.net>
Sun, 30 Sep 2018 12:50:42 +0000 (22:50 +1000)
commit1313fc262a7c2031979cae18ef425ba3242a6fbe
tree3599548ce0ededc2f8d2d69e16d8b5ab992c8d02
parentc2fb44193f57b4da2d053f4d7ce9cb388df52927
parent6106500d9562e3964f10a534b2721b35d764c995
Merge branch 'master' into Mario/weapons_fpsfix
qcsrc/client/autocvars.qh
qcsrc/common/mutators/mutator/overkill/oknex.qc
qcsrc/common/mutators/mutator/overkill/okrpc.qc
qcsrc/common/mutators/mutator/overkill/okshotgun.qc
qcsrc/common/weapons/weapon/hagar.qc
qcsrc/server/weapons/weaponsystem.qc
xonotic-client.cfg