]> 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: cefbf3f 74d6e69)
Merge branch 'terencehill/ice_nade_revival_progress_fixes'
authorterencehill <piuntn@gmail.com>
Tue, 13 Apr 2021 12:53:03 +0000 (14:53 +0200)
committerterencehill <piuntn@gmail.com>
Tue, 13 Apr 2021 12:53:03 +0000 (14:53 +0200)

Trivial merge