]> 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: e22347e 7acf313)
Merge branch 'master' into LegendaryGuard/armorizing_and_dark_nades
authorLegendaryGuard <rootuser999@gmail.com>
Sat, 12 Jun 2021 14:49:18 +0000 (16:49 +0200)
committerLegendaryGuard <rootuser999@gmail.com>
Sat, 12 Jun 2021 14:49:18 +0000 (16:49 +0200)

Trivial merge