From: Jakob MG <jakob_mg@hotmail.com>
Date: Tue, 28 Feb 2012 05:42:06 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into tzork/gm_nexball
X-Git-Tag: xonotic-v0.6.0~40^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2c5bebce47736537b1a2311fb52db41a481f27f1;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/master' into tzork/gm_nexball

Conflicts:
	qcsrc/server/cl_weapons.qc
---

2c5bebce47736537b1a2311fb52db41a481f27f1
diff --cc qcsrc/server/cl_weapons.qc
index dc827c9a2,fac0d73aa..4a12ce185
--- a/qcsrc/server/cl_weapons.qc
+++ b/qcsrc/server/cl_weapons.qc
@@@ -282,6 -318,8 +318,8 @@@ float W_IsWeaponThrowable(float w
  		return 0;
  	if (g_cts)
  		return 0;
 -	if (g_nexball && w == WEP_PORTO)
++	if (g_nexball && w == WEP_GRENADE_LAUNCHER)
+ 		return 0;
  
  	wb = W_WeaponBit(w);
  	if(!wb)