]> 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: 54baffb 7b86c6c)
Merge branch 'Mario/no_csproject_test' into 'master'
authorLegendaryGuard <rootuser999@gmail.com>
Sat, 2 Jul 2022 21:03:05 +0000 (21:03 +0000)
committerLegendaryGuard <rootuser999@gmail.com>
Sat, 2 Jul 2022 21:03:05 +0000 (21:03 +0000)
Merge branch Mario/no_csproject_test (XS merge request)

See merge request xonotic/xonotic-data.pk3dir!1043


Trivial merge