From: Mario <zacjardine@y7mail.com>
Date: Sun, 8 Nov 2015 08:27:53 +0000 (+0000)
Subject: Merge branch 'terencehill/menu_languages' into 'master'
X-Git-Tag: xonotic-v0.8.2~1688
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=317ec3eb27ada1c4668876e9499136125acb7984;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'terencehill/menu_languages' into 'master'

menu languages

Fix Deutsch (Schweiz) displayed incorrectly in the language selector by changing the language entry format in language.txt (and by making the necessary changes to the parsers)

See merge request !241
---

317ec3eb27ada1c4668876e9499136125acb7984