From: Mario <zacjardine@y7mail.com>
Date: Sun, 17 Mar 2019 07:52:39 +0000 (+0000)
Subject: Merge branch 'mirceakitsune/button14' into 'master'
X-Git-Tag: xonotic-v0.8.5~1576
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e0dcacd2988c70f6f98c2328dbbf39a21daa08ea;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'mirceakitsune/button14' into 'master'

Replace button14 with button12 for minigame state

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

e0dcacd2988c70f6f98c2328dbbf39a21daa08ea