From: Samual <samual@xonotic.org>
Date: Thu, 21 Apr 2011 01:27:22 +0000 (-0400)
Subject: Merge remote branch 'origin/master' into mirceakitsune/event_chasecam
X-Git-Tag: xonotic-v0.5.0~268^2^2~7
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a89a627ea0a1c8209ea7406910566d259bc8ffb0;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/master' into mirceakitsune/event_chasecam

Conflicts:
	defaultXonotic.cfg
	qcsrc/client/View.qc
---

a89a627ea0a1c8209ea7406910566d259bc8ffb0
diff --cc qcsrc/client/View.qc
index 4a0d48686,1a1c37624..7aa306aee
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@@ -366,8 -366,8 +366,10 @@@ vector myhealth_gentlergb
  float contentavgalpha, liquidalpha_prev;
  vector liquidcolor_prev;
  
 +float eventchase_current_distance;
 +
+ float checkfail[16];
+ 
  void CSQC_UpdateView(float w, float h)
  {
  	entity e;