]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1c5f42d 0fcd94b)
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)
Merge branch Mario/status_effects_extended (XL merge request)

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


Trivial merge