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)
1  2 
qcsrc/common/weapons/weapon/machinegun.qc
qcsrc/server/weapons/weaponsystem.qc

Simple merge