projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
34ddb93
f069d09
)
Merge remote-tracking branch 'origin/terencehill/menu_langwarning'
author
Rudolf Polzer <divverent@xonotic.org>
Wed, 4 Jun 2014 09:29:43 +0000
(11:29 +0200)
committer
Rudolf Polzer <divverent@xonotic.org>
Wed, 4 Jun 2014 09:29:43 +0000
(11:29 +0200)
* 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
Trivial merge