]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into z411/bai-server
authorz411 <z411@omaera.org>
Thu, 18 Nov 2021 17:33:23 +0000 (14:33 -0300)
committerz411 <z411@omaera.org>
Thu, 18 Nov 2021 17:33:23 +0000 (14:33 -0300)
commitc74522370e6862d8a4075a6c777dba3ae0abc5ed
tree0159705aefe10197324e763a174a9bf3dc48098b
parent8183a9e752fbdfd6862cdafd13e682d662788049
parent1cea8bc29d5cf40163b06332d03ea4d56cf5f276
Merge branch 'master' into z411/bai-server
balance-xonotic.cfg
balance-xpm.cfg
qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc
qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc
qcsrc/common/weapons/weapon/electro.qc