]> de.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: a8f331d 13be05d)
Merge branch 'master' into terencehill/full_damage_fix
authorterencehill <piuntn@gmail.com>
Fri, 18 Mar 2022 22:30:13 +0000 (23:30 +0100)
committerterencehill <piuntn@gmail.com>
Fri, 18 Mar 2022 22:30:13 +0000 (23:30 +0100)

Trivial merge