From: Samual Lenks <samual@xonotic.org>
Date: Sun, 18 Aug 2013 19:31:58 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/samual/menu_organization' into samual/combined_u... 
X-Git-Tag: xonotic-v0.8.0~139^2~1^2~154
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=747695127cde71a71f63e0d364ff6e9756660369;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/samual/menu_organization' into samual/combined_updates

Conflicts:
	qcsrc/menu/xonotic/dialog_multiplayer.c
---

747695127cde71a71f63e0d364ff6e9756660369
diff --cc qcsrc/menu/xonotic/dialog_multiplayer.c
index 0ea419721,8bb9e337f..ba85f8c8c
--- a/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);