]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'bones_was_here/q3compat' into 'master'
authorMario <mario.mario@y7mail.com>
Fri, 10 Sep 2021 15:34:51 +0000 (15:34 +0000)
committerMario <mario.mario@y7mail.com>
Fri, 10 Sep 2021 15:34:51 +0000 (15:34 +0000)
Merge branch bones_was_here/q3compat

Closes #2465

See merge request xonotic/xonotic-data.pk3dir!849

1  2 
qcsrc/common/mutators/mutator/powerups/powerup/invisibility.qh
qcsrc/common/mutators/mutator/powerups/powerup/speed.qh
qcsrc/server/client.qc
qcsrc/server/items/items.qc
xonotic-server.cfg

Simple merge
Simple merge
Simple merge