]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/electro_combo_over_time
authorterencehill <piuntn@gmail.com>
Sun, 30 Apr 2023 09:35:04 +0000 (11:35 +0200)
committerterencehill <piuntn@gmail.com>
Sun, 30 Apr 2023 09:35:04 +0000 (11:35 +0200)
commite19be1e6321de909c7d920871cb9bf73e948bebf
treeb4659ed428c7163c1c7f34e62915b046c1ca89b3
parenta7432cf9e6726c4123fb41b68c47182fd5cb894e
parentcd6c2c93684d30a3e2878d8f4d48875dcd4c1978
Merge branch 'master' into Mario/electro_combo_over_time

# Conflicts:
# .gitlab-ci.yml
qcsrc/common/weapons/weapon/electro.qc
qcsrc/server/damage.qc