]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into drjaska/mgdamageaccumulation
authordrjaska <drjaska83@gmail.com>
Sun, 27 Nov 2022 03:26:52 +0000 (05:26 +0200)
committerdrjaska <drjaska83@gmail.com>
Sun, 27 Nov 2022 03:26:52 +0000 (05:26 +0200)
commita55543c6c5dc14726520ae27cc1e271a5b70ff93
tree9d727052dc8b01ac1709695051aa3c361c5674e3
parentb2607e232af39ddff10977e29063206b6b4352b6
parentf021fcfd75f824918bb2593cc58302ffa8377b77
Merge branch 'master' into drjaska/mgdamageaccumulation