]> de.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: f64899f 318ea8d)
Merge branch 'master' into LegendaryGuard/cyber
authorLegendaryGuard <rootuser999@gmail.com>
Mon, 13 Sep 2021 21:37:36 +0000 (23:37 +0200)
committerLegendaryGuard <rootuser999@gmail.com>
Mon, 13 Sep 2021 21:37:36 +0000 (23:37 +0200)

Trivial merge