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)
commite0dcacd2988c70f6f98c2328dbbf39a21daa08ea
tree5f8388e0e508316a8d4e4997247c045b9ad27429
parentff895b63117ada5f7d1156092af00276e274f2c0
parent1c458eaae6b3923322f9b4e9e439d6f24cde672a
Merge branch 'mirceakitsune/button14' into 'master'

Replace button14 with button12 for minigame state

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