]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit - qcsrc/server/player.qc
Merge branch 'Mario/status_effects_extended' into 'master'
authorterencehill <piuntn@gmail.com>
Wed, 23 Jun 2021 14:41:38 +0000 (14:41 +0000)
committerterencehill <piuntn@gmail.com>
Wed, 23 Jun 2021 14:41:38 +0000 (14:41 +0000)
commitf61d242872ea00cd4eb0cd65b0ec1bef639ae4fe
tree90d423944e6d91ce8d7a9df6561f9a9bb3a50b8f
parent1c5f42d4d77a7f8ec969df7d3333a7ee6c0c312f
parent0fcd94b4d880d4f4983b7ff73e36064ac70ee6fd
Merge branch 'Mario/status_effects_extended' into 'master'

Merge branch Mario/status_effects_extended (XL merge request)

See merge request xonotic/xonotic-data.pk3dir!916