]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into 'LegendaryGuard/cyber'
authorLegendaryGuard <theasixchan777@gmail.com>
Sun, 12 Sep 2021 17:10:00 +0000 (19:10 +0200)
committerLegendaryGuard <theasixchan777@gmail.com>
Sun, 12 Sep 2021 17:10:00 +0000 (19:10 +0200)
commit52dfef8309efe7b109ef380b564a54416c4863d7
tree0ab9566ec5364266ca48821b67465dba11fcfaa6
parentf64f0278c2b65c99d051a75313a3f6f8fffceb85
parent05878d3a4c3285af636dd5e9f9b3aa1f54e6b3fb
Merge branch 'master' into 'LegendaryGuard/cyber'
qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc
qcsrc/common/weapons/weapon/electro.qc
qcsrc/server/client.qc
qcsrc/server/client.qh
qcsrc/server/command/sv_cmd.qc
qcsrc/server/mutators/events.qh