]> 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: 350dd64 b88055b)
Merge branch 'drjaska/electrorefirefix' into 'master'
authorterencehill <piuntn@gmail.com>
Sun, 12 Sep 2021 11:49:33 +0000 (11:49 +0000)
committerterencehill <piuntn@gmail.com>
Sun, 12 Sep 2021 11:49:33 +0000 (11:49 +0000)
Fix inconsistency with electro refire time

Closes #2569

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


Trivial merge