]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into Mario/weapons_fpsfix
authorMario <mario@smbclan.net>
Mon, 25 Jun 2018 05:25:08 +0000 (15:25 +1000)
committerMario <mario@smbclan.net>
Mon, 25 Jun 2018 05:25:08 +0000 (15:25 +1000)
1  2 
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

Simple merge
Simple merge
Simple merge
Simple merge