]> 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 | compact (merge: ff895b6 1c458ea)
Merge branch 'mirceakitsune/button14' into 'master'
authorMario <zacjardine@y7mail.com>
Sun, 17 Mar 2019 07:52:39 +0000 (07:52 +0000)
committerMario <zacjardine@y7mail.com>
Sun, 17 Mar 2019 07:52:39 +0000 (07:52 +0000)
Replace button14 with button12 for minigame state

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


Trivial merge