Merge branch 'master' into martin-t/bullet-trails
authorMartin Taibr <taibr.martin@gmail.com>
Wed, 26 Sep 2018 06:43:27 +0000 (08:43 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Wed, 26 Sep 2018 06:43:27 +0000 (08:43 +0200)
commit791f300d2660d6b75a51c6e7f302d6fa6b64861a
tree74f36cb187175344caee8b8bfa16d0c4b5d73011
parente3363db1ed370ea04efcdfc897c97d6c5d1b2222
parent5d36c4af90925223244be05529c0152f5011e7ce
Merge branch 'master' into martin-t/bullet-trails
qcsrc/common/effects/all.inc
qcsrc/common/mutators/mutator/overkill/okshotgun.qc
qcsrc/common/vehicles/vehicle/spiderbot.qc
qcsrc/common/weapons/weapon/shotgun.qc
qcsrc/server/weapons/tracing.qc