From: Rudolf Polzer <divverent@xonotic.org>
Date: Wed, 4 Jun 2014 09:29:43 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/terencehill/menu_langwarning'
X-Git-Tag: xonotic-v0.8.0~193
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d7ce456aa93a09db42b7c9db3c98049b382b791d;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/terencehill/menu_langwarning'

* origin/terencehill/menu_langwarning:
  Apply the selected language, restarting the menu, only if it's different from the current one; display a warning dialog when switching language while connected
---

d7ce456aa93a09db42b7c9db3c98049b382b791d