]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/status_effects_extended
authorMario <mario.mario@y7mail.com>
Tue, 22 Jun 2021 10:57:52 +0000 (20:57 +1000)
committerMario <mario.mario@y7mail.com>
Tue, 22 Jun 2021 10:57:52 +0000 (20:57 +1000)
commit44206d0c50c5cdd9baad0152f6695a83135891e8
tree7ed466e37da0aa67b3d017921eaae9b9543e63e2
parent1a2de776e0671e51a04fa7909e063692e2952d9e
parenta4c29b5282d887937c29ed834dee9fb3c392d734
Merge branch 'master' into Mario/status_effects_extended
qcsrc/server/client.qc
qcsrc/server/items/items.qc