]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/electro_combo_over_time
authorMario <mario.mario@y7mail.com>
Mon, 2 Sep 2024 09:29:10 +0000 (19:29 +1000)
committerMario <mario.mario@y7mail.com>
Mon, 2 Sep 2024 09:29:10 +0000 (19:29 +1000)
commit486e6c93805c94395b5d20016575327343760735
tree9ea585ae55ff53fe2e004870d7a0870a05c42bf3
parent4966300e0f98bc728680320f7ec9e083b16c430f
parent2b678afda991834a6490c56c9df14b06f4fca484
Merge branch 'master' into Mario/electro_combo_over_time
.gitlab-ci.yml
bal-wep-mario.cfg
bal-wep-nexuiz25.cfg
bal-wep-samual.cfg
bal-wep-xdf.cfg
bal-wep-xonotic.cfg
qcsrc/common/weapons/weapon/electro.qc
qcsrc/common/weapons/weapon/electro.qh