From: Rudolf Polzer <divVerent@xonotic.org>
Date: Mon, 22 Aug 2011 19:57:43 +0000 (+0200)
Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic
X-Git-Tag: xonotic-v0.5.0~28
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=28c8560a7a9c20eb72eb68ecf4ef232005a672f8;p=xonotic%2Fxonotic.git

Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic
---

28c8560a7a9c20eb72eb68ecf4ef232005a672f8
diff --cc server/server.cfg
index 8f495976,9f641949..2f7a5586
--- a/server/server.cfg
+++ b/server/server.cfg
@@@ -114,9 -165,11 +165,11 @@@ sv_weaponstats_file http://www.xonotic.
  /////////////////////////////////////////////////////////////////////
  // "Obvious" mutators that are allowed on a "pure" server
  //g_minstagib 0	// set to 1 for MinstaGib
 -g_weapon_stay 0 // set to 1, 2 or 3 for different weapon-stay modes (1 = traditional, 2 = no ammo but allow throwing, 3 = ghost weapon stay)
 +//g_weapon_stay 0 // set to 1, 2 or 3 for different weapon-stay modes (1 = traditional, 2 = no ammo but allow throwing, 3 = ghost weapon stay)
  
  
+ 
+ 
  /////////////////////////////////////////////////////////////////////
  // WARNING: anything below this line makes your server "impure"!