]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into terencehill/glowmod_color_fix
authorterencehill <piuntn@gmail.com>
Sat, 12 Dec 2020 16:58:08 +0000 (17:58 +0100)
committerterencehill <piuntn@gmail.com>
Sat, 12 Dec 2020 16:58:08 +0000 (17:58 +0100)
commit74ab018d9c0857ea241cae2c8ac8b2d64bcbc332
treea5677b80a2f2575d3488397a06bba3b443fb69cc
parentce80a3d3800ee2f5ce8a8d93ccb6b835a46ec5f6
parent64c74c48540f4633530fedd8e14801b8781846ff
Merge branch 'master' into terencehill/glowmod_color_fix
qcsrc/client/csqcmodel_hooks.qc
qcsrc/client/weapons/projectile.qc
qcsrc/common/weapons/all.qh