]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into Mario/polytrails Mario/polytrails
authorMario <mario.mario@y7mail.com>
Tue, 24 Dec 2024 01:08:06 +0000 (11:08 +1000)
committerMario <mario.mario@y7mail.com>
Tue, 24 Dec 2024 01:08:06 +0000 (11:08 +1000)
1  2 
qcsrc/client/main.qh
qcsrc/common/weapons/weapon/electro.qh
xonotic-client.cfg

Simple merge
Simple merge