]> 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: 668f983 6b87df9)
Merge branch 'drlg/manhunt' of https://gitlab.com/xonotic/xonotic-data.pk3dir into...
authorLegendaryGuard <rootuser999@gmail.com>
Mon, 29 Nov 2021 01:17:04 +0000 (02:17 +0100)
committerLegendaryGuard <rootuser999@gmail.com>
Mon, 29 Nov 2021 01:17:04 +0000 (02:17 +0100)

Trivial merge