]> 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: 09c56b2 1d4a86a)
Merge branch 'drjaska/electrolimitfix' into 'master'
authorterencehill <piuntn@gmail.com>
Mon, 29 Mar 2021 13:28:16 +0000 (13:28 +0000)
committerterencehill <piuntn@gmail.com>
Mon, 29 Mar 2021 13:28:16 +0000 (13:28 +0000)
Fixed electro secondary limit being global

Closes #2566

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


Trivial merge