]> 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: a4920b3 20acea9)
Merge branch 'drjaska/sync-bal-wep-mario' into 'master'
authorbones_was_here <bones_was_here@xonotic.au>
Wed, 31 May 2023 02:48:42 +0000 (02:48 +0000)
committerbones_was_here <bones_was_here@xonotic.au>
Wed, 31 May 2023 02:48:42 +0000 (02:48 +0000)
sync 2 vanilla changes to Mario's balance as per their preference

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


Trivial merge