From: Samual <samual@xonotic.org>
Date: Tue, 10 Jan 2012 19:13:15 +0000 (-0500)
Subject: Merge remote branch 'origin/master' into samual/menu_updates
X-Git-Tag: xonotic-v0.6.0~188
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=7b71d7d90d28e0365ce11f94c3460f5b71211312;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/master' into samual/menu_updates

Conflicts:
	defaultXonotic.cfg
---

7b71d7d90d28e0365ce11f94c3460f5b71211312
diff --cc defaultXonotic.cfg
index 62a8686cd,52c14b2be..94b6cc632
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@@ -1231,8 -1136,7 +1140,7 @@@ set quit_and_redirect ""	"set to an IP 
  set g_campaign 0
  set g_campaign_forceteam 0 "Forces the player to a given team in campaign mode, 1 = red, 2 = blue, 3 = yellow, 4 = pink"
  seta g_campaign_name "xonoticbeta"
 -set g_campaign_skill 0
 +seta g_campaign_skill -1 // -2 easy -1 medium 0 hard
- alias warp "sv_cmd warp $*"
  
  alias singleplayer_start "g_campaign_index 0; set scmenu_campaign_goto 0"
  alias singleplayer_continue "set scmenu_campaign_goto -1"