Merge branch 'master' into cloudwalk9/mgburstfix
authorMartin Taibr <taibr.martin@gmail.com>
Thu, 12 Sep 2019 19:21:25 +0000 (21:21 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Thu, 12 Sep 2019 19:21:25 +0000 (21:21 +0200)
commit139a594d29f65508e5d6001e90d4ee4fad82ca66
treeedc9bfca1941aeffd4eaf805bc642d4ef2b7be24
parentfada5c8bfa9e769669bdefee4e90d5b473fb174e
parent65f8f7b31f6c7f9928d729c4110304efe3406858
Merge branch 'master' into cloudwalk9/mgburstfix
qcsrc/common/weapons/weapon/machinegun.qc
qcsrc/server/weapons/weaponsystem.qc