]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commit983dadcd6efdec7d6ec6037c05d3f063e9eb41b7
treec1ad1819ab02ed5e96aa4bad58791a6d51a1d439
parenta4920b30ea8dc8c548d23561766b6efd5955d221
parent20acea9b1ccd0a24e38b7e1c58a9560540fffb34
Merge branch 'drjaska/sync-bal-wep-mario' into 'master'

sync 2 vanilla changes to Mario's balance as per their preference

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