]> 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: 0b52904 cb9daeb)
Merge remote-tracking branch 'origin/Juhu/q3df_teleporter_flags' into morosophos...
authorNick S <nick@teichisma.info>
Sun, 5 Feb 2023 21:19:54 +0000 (23:19 +0200)
committerNick S <nick@teichisma.info>
Sun, 5 Feb 2023 21:19:54 +0000 (23:19 +0200)

Trivial merge