]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge remote-tracking branch 'origin/master' into morosophos/server-current4
authorNikolay S <nick@teichisma.info>
Sun, 1 Dec 2024 16:06:46 +0000 (17:06 +0100)
committerNikolay S <nick@teichisma.info>
Sun, 1 Dec 2024 16:06:46 +0000 (17:06 +0100)
1  2 
bal-wep-mario.cfg
bal-wep-nexuiz25.cfg
bal-wep-samual.cfg
bal-wep-xdf.cfg
bal-wep-xonotic.cfg

Simple merge
Simple merge
Simple merge
diff --cc bal-wep-xdf.cfg
Simple merge
Simple merge