]> 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: ad113ef fc3d153)
Merge remote-tracking branch 'origin/Juhu/strafehud-server' into morosophos/server...
authorNick S <nick@teichisma.info>
Wed, 14 Sep 2022 09:51:42 +0000 (12:51 +0300)
committerNick S <nick@teichisma.info>
Wed, 14 Sep 2022 09:51:42 +0000 (12:51 +0300)

Trivial merge