]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/player_alpha
authorMario <mario.mario@y7mail.com>
Fri, 17 Jul 2020 08:09:24 +0000 (18:09 +1000)
committerMario <mario.mario@y7mail.com>
Fri, 17 Jul 2020 08:09:24 +0000 (18:09 +1000)
commit3e8b5d79372979ce0944ce8418b6f33417de3dd1
tree6d3df1a578e4329b5d2b9cca3693fae50a67103b
parent4e0bc6328c1332e0fb8326e75611ffb053ab8a4b
parent93e98e9d0187a81935aee4a2dfde8cb9410af67a
Merge branch 'master' into Mario/player_alpha
qcsrc/common/mutators/mutator/buffs/sv_buffs.qc
qcsrc/common/mutators/mutator/instagib/sv_instagib.qc
qcsrc/common/mutators/mutator/nades/nades.qc
qcsrc/server/client.qc
qcsrc/server/mutators/events.qh