]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commit0077b35c61daf393301b42b006f77f75c8f476f7
tree8baf7ed1093aa880f5af020d5e2aa86877693d26
parent6b732bbf9fb6620f6e2b068f05f68d8b017a4299
parent4ad190463ce91b1dd7315c6c1975a394ae871c69
Merge branch 'master' into Mario/polytrails
qcsrc/client/main.qh
qcsrc/common/weapons/weapon/electro.qh
xonotic-client.cfg