]> 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: dd61cdb 6a5b085)
Merge remote-tracking branch 'origin/Juhu/strafehud-server' into morosophos/server...
authorNick S <nick@teichisma.info>
Sat, 4 Feb 2023 10:08:36 +0000 (12:08 +0200)
committerNick S <nick@teichisma.info>
Sat, 4 Feb 2023 10:08:36 +0000 (12:08 +0200)

Trivial merge