From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Fri, 22 Apr 2011 15:41:02 +0000 (+0300)
Subject: Merge branch 'master' into mirceakitsune/hud_postprocessing
X-Git-Tag: xonotic-v0.5.0~173^2~3^2~13
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=324d1afe64b738ee2e6960f6da5174ce11d87753

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

324d1afe64b738ee2e6960f6da5174ce11d87753
diff --cc qcsrc/client/View.qc
index d51c2feb54,1a1c37624d..732346acef
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@@ -369,7 -366,7 +369,8 @@@ vector myhealth_gentlergb
  float contentavgalpha, liquidalpha_prev;
  vector liquidcolor_prev;
  
 +vector damage_blurpostprocess, content_blurpostprocess;
+ float checkfail[16];
  
  void CSQC_UpdateView(float w, float h)
  {