]> 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: 97c2453 ac04a82)
Merge remote-tracking branch 'origin/Juhu/velocity_pads' into morosophos/server-current4
authorNick S <nick@teichisma.info>
Fri, 27 Jan 2023 15:21:56 +0000 (17:21 +0200)
committerNick S <nick@teichisma.info>
Fri, 27 Jan 2023 15:21:56 +0000 (17:21 +0200)

Trivial merge