Merge branch 'master' into martin-t/bullet-trails 521/head
authorMartin Taibr <taibr.martin@gmail.com>
Sun, 30 Sep 2018 12:24:21 +0000 (14:24 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Sun, 30 Sep 2018 12:24:21 +0000 (14:24 +0200)
commitb9ed1a38cd897084d0ed8beb6033a761e095d64d
tree808890efe4aec60c94eb231db7aa6504ed8f2477
parent791f300d2660d6b75a51c6e7f302d6fa6b64861a
parent7db9f51f9d0650644c0610db733c126e327cccb1
Merge branch 'master' into martin-t/bullet-trails
qcsrc/common/weapons/weapon/machinegun.qc
qcsrc/common/weapons/weapon/rifle.qc
qcsrc/common/weapons/weapon/shotgun.qc