From: Samual <samual@xonotic.org>
Date: Mon, 19 Dec 2011 20:52:19 +0000 (-0500)
Subject: Merge remote branch 'origin/master' into samual/updatecommands
X-Git-Tag: xonotic-v0.6.0~188^2~28^2~97
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8f0281c70368ec92197867d6181e5e955b5fd6c1;p=xonotic%2Fxonotic-data.pk3dir.git

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

Conflicts:
	defaultXonotic.cfg
---

8f0281c70368ec92197867d6181e5e955b5fd6c1
diff --cc defaultXonotic.cfg
index d07603b6b,5535d9cce..9e443b846
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@@ -953,7 -995,10 +953,8 @@@ seta cl_notify_carried_items "3" "notif
  
  // startmap_dm is used when running with the -listen or -dedicated commandline options
  set serverconfig server.cfg
- alias startmap_dm "set _sv_init 0; map _init/_init; exec $serverconfig; set _sv_init 1; map _init/_init"
+ set _sv_init 0
+ alias startmap_dm "set _sv_init 0; map _init/_init; exec $serverconfig; set _sv_init 1"
 -alias sv_loadconfig "exec $serverconfig"
 -alias sv_restart "say \"Server will restart at the end of the match, you will all be reconnected automatically. $* \"; quit_and_redirect self"
  
  // aliases:
  alias +fire +attack