Merge branch 'master' into terencehill/glowmod_color_fix
authorterencehill <piuntn@gmail.com>
Mon, 8 Jun 2020 16:20:23 +0000 (18:20 +0200)
committerterencehill <piuntn@gmail.com>
Mon, 8 Jun 2020 16:20:23 +0000 (18:20 +0200)
commit5adc9ca82afe8f5bb4bd1346a0cf9934622818ba
treec0791ca82ffa7767a721e9a1d64d0cf59ea47c2f
parentcfe9b145c2ef4d05266be6d522551954f226ab6c
parentf17750f1a748960a2ed79995a4ddb5767f47e8b5
Merge branch 'master' into terencehill/glowmod_color_fix
qcsrc/client/csqcmodel_hooks.qc
qcsrc/client/weapons/projectile.qc
qcsrc/common/weapons/all.qh