]> 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: 111cb08 45df581)
Merge branch 'bones_was_here/806' into 'master'
authorbones_was_here <bones_was_here@xonotic.au>
Tue, 20 Jun 2023 12:20:37 +0000 (22:20 +1000)
committerbones_was_here <bones_was_here@xonotic.au>
Tue, 20 Jun 2023 12:20:37 +0000 (22:20 +1000)
This was the 0.8.6 stable release branch which needs to be merged to get
the tagged commit into master.


Trivial merge