]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/status_effects_extended
authorMario <mario.mario@y7mail.com>
Wed, 23 Jun 2021 03:17:16 +0000 (13:17 +1000)
committerMario <mario.mario@y7mail.com>
Wed, 23 Jun 2021 03:17:16 +0000 (13:17 +1000)
commit96d7859bf7144313cbe9c4582e8af355b02816f7
tree7b2a67f93c95b89ee156eb99ee128805f11f55ba
parent44206d0c50c5cdd9baad0152f6695a83135891e8
parent73588b4fa5052e8915dad3081d4af4d905b4ea54
Merge branch 'master' into Mario/status_effects_extended
qcsrc/server/client.qc
qcsrc/server/world.qc