Merge branch 'Mario/defs_update' into 'master'
authorMario <mario.mario@y7mail.com>
Thu, 16 Jul 2020 11:18:23 +0000 (11:18 +0000)
committerMario <mario.mario@y7mail.com>
Thu, 16 Jul 2020 11:18:23 +0000 (11:18 +0000)
commit3646887fc4f0d75d04b689ec11d4e669b6bd4340
tree4c2f57f50a91e3361b0904cf16eb80a8a131a8a5
parentdfe9da34b0e7181304a31745d4b01f7937e6213c
parent031d9bb9b547f476647eb48cd053bd5936e61157
Merge branch 'Mario/defs_update' into 'master'

Merge branch Mario/defs_update (XXS merge request)

See merge request xonotic/xonotic-data.pk3dir!842
qcsrc/dpdefs/csprogsdefs.qh