]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 48ee8d8 f7e63a2)
Merge branch 'LegendaryGuard/ttt' into LegendaryGuard/bai_mod
authorLegendaryGuard <rootuser999@gmail.com>
Thu, 29 Apr 2021 18:51:11 +0000 (20:51 +0200)
committerLegendaryGuard <rootuser999@gmail.com>
Thu, 29 Apr 2021 18:51:11 +0000 (20:51 +0200)

Trivial merge