]> 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: f30767b b790402)
Merge remote-tracking branch 'origin/Juhu/q3df_teleporter_flags' into morosophos...
authorNick S <nick@teichisma.info>
Thu, 30 Mar 2023 18:42:20 +0000 (21:42 +0300)
committerNick S <nick@teichisma.info>
Thu, 30 Mar 2023 18:42:20 +0000 (21:42 +0300)

Trivial merge