Merge branch 'master' into Lyberta/OffhandBlaster 534/head
authorLyberta <lyberta@lyberta.net>
Sat, 17 Feb 2018 05:21:25 +0000 (08:21 +0300)
committerLyberta <lyberta@lyberta.net>
Sat, 17 Feb 2018 05:21:25 +0000 (08:21 +0300)
commit91819987a61f7675e34866edcb0fe3671a9b1ba4
tree09611cd300a03039cb497d6b85bdf57f961996d5
parentca58ddddb186ef544c54791364ceb626c7f435d9
parent9e8ea75b9aacffc5cfa18c8852c4dd9ffdbd3192
Merge branch 'master' into Lyberta/OffhandBlaster
qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
qcsrc/common/weapons/weapon/blaster.qc
qcsrc/common/weapons/weapon/blaster.qh
qcsrc/common/weapons/weapon/vaporizer.qc