From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Tue, 19 Apr 2011 21:55:10 +0000 (+0300)
Subject: Merge branch 'master' into mirceakitsune/event_chasecam
X-Git-Tag: xonotic-v0.5.0~268^2^2~6^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6bd3f804ff3027214c87e0bbbc9f712d2df4fe6c;p=xonotic%2Fxonotic-data.pk3dir.git

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

6bd3f804ff3027214c87e0bbbc9f712d2df4fe6c
diff --cc qcsrc/client/View.qc
index ce78cbbc6,1a1c37624..71a4429ef
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@@ -366,7 -366,7 +366,8 @@@ vector myhealth_gentlergb
  float contentavgalpha, liquidalpha_prev;
  vector liquidcolor_prev;
  
 +float eventchase_current_distance;
+ float checkfail[16];
  
  void CSQC_UpdateView(float w, float h)
  {