]> 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: 55b9800 070a74a)
Merge branch 'LegendaryGuard/bai_mod' into z411/bai-server
authorz411 <z411@omaera.org>
Fri, 7 May 2021 20:39:23 +0000 (16:39 -0400)
committerz411 <z411@omaera.org>
Fri, 7 May 2021 20:39:23 +0000 (16:39 -0400)

Trivial merge