Merge remote-tracking branch 'origin/samual/menu_organization' into samual/combined_u...

Conflicts:
	qcsrc/menu/xonotic/dialog_multiplayer.c

diff --cc qcsrc/menu/classes.c
Simple merge

diff --cc qcsrc/menu/xonotic/dialog_multiplayer.c
index 0ea41972121c63ea2692b38af84e56c919dd4e5d,8bb9e337f3de43e374ae93b4f98978287d1d3701..ba85f8c8cb5e61101d7357c89f40b6bdf2e0f59b
--- 1/qcsrc/menu/xonotic/dialog_multiplayer.c
--- 2/qcsrc/menu/xonotic/dialog_multiplayer.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer.c
@@@ -17,9 -17,10 +17,12 @@@ void XonoticMultiplayerDialog_fill(enti
        me.TR(me);
                me.TD(me, 1, 1, e = mc.makeTabButton(mc, _("Servers"), makeXonoticServerListTab()));
                me.TD(me, 1, 1, e = mc.makeTabButton(mc, _("Create"), makeXonoticServerCreateTab()));
-               me.TD(me, 1, 1, e = mc.makeTabButton(mc, _("Demos"), makeXonoticDemoBrowserTab()));
-               me.TD(me, 1, 1, e = mc.makeTabButton(mc, _("Screenshots"), makeXonoticScreenshotBrowserTab()));
-               me.TD(me, 1, 1, e = mc.makeTabButton(mc, _("Player Setup"), makeXonoticPlayerSettingsTab()));
++              //me.TD(me, 1, 1, e = mc.makeTabButton(mc, _("Demos"), makeXonoticDemoBrowserTab()));
++              //me.TD(me, 1, 1, e = mc.makeTabButton(mc, _("Screenshots"), makeXonoticScreenshotBrowserTab()));
+               //me.TD(me, 1, 1, e = mc.makeTabButton(mc, _("Players"), makeXonoticDemoBrowserTab()));
+               me.TD(me, 1, 1, e = mc.makeTabButton(mc, _("Media"), makeXonoticDemoBrowserTab()));
+               me.TD(me, 1, 1, e = mc.makeTabButton(mc, _("Profile"), makeXonoticPlayerSettingsTab()));
+ 
        me.TR(me);
        me.TR(me);
                me.TD(me, me.rows - 2, me.columns, mc);

diff --cc qcsrc/menu/xonotic/mainwindow.c
Simple merge