From: Mario Date: Mon, 4 Jan 2016 11:51:32 +0000 (+0000) Subject: Merge branch 'terencehill/menu_fixes' into 'master' X-Git-Tag: xonotic-v0.8.2~1285 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7bcb3a89b3271e018da4d92437dc5ba125ea8698;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'terencehill/menu_fixes' into 'master' Menu fixes Misc bug fixes, most notable ones are in the first 2 commits: * Increase number of rows of Game Settings tabs so they match Settings tab rows and add back items that long time ago got removed when nested tabs were introduced * Add back a few Apply buttons and update/fix their commands See merge request !264 --- 7bcb3a89b3271e018da4d92437dc5ba125ea8698