From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Mon, 9 Jan 2012 00:13:11 +0000 (+0200)
Subject: Merge branch 'master' into mirceakitsune/damage_effects
X-Git-Tag: xonotic-v0.6.0~110^2^2~41
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=21403f1e9510d608415d14bf4348880b9ff42204;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into mirceakitsune/damage_effects
---

21403f1e9510d608415d14bf4348880b9ff42204
diff --cc qcsrc/client/Main.qc
index e8d303ff6,8facbf500..f2f5ac86d
--- a/qcsrc/client/Main.qc
+++ b/qcsrc/client/Main.qc
@@@ -197,7 -197,7 +197,11 @@@ void CSQC_Init(void
  	hud_configure_prev = -1;
  	tab_panel = -1;
  
++
 +	precache_model("models/null.md3");
++
+ 	draw_currentSkin = strzone(strcat("gfx/menu/", cvar_string("menu_skin")));
++
  }
  
  // CSQC_Shutdown : Called every time the CSQC code is shutdown (changing maps, quitting, etc)