]> 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: 78274c6 43e2f03)
Merge remote-tracking branch 'origin/Juhu/target_speed' into morosophos/server-current4
authorNick S <nick@teichisma.info>
Mon, 6 Feb 2023 10:30:24 +0000 (12:30 +0200)
committerNick S <nick@teichisma.info>
Mon, 6 Feb 2023 10:30:24 +0000 (12:30 +0200)

Trivial merge