From: Rudolf Polzer <divverent@alientrap.org>
Date: Thu, 18 Nov 2010 06:27:49 +0000 (+0100)
Subject: Merge remote branch 'origin/fruitiex/csqc_polyblend'
X-Git-Tag: xonotic-v0.1.0preview~122^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d322b466ecbb228eb52a863aec00aa6c9321af95;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/fruitiex/csqc_polyblend'
---

d322b466ecbb228eb52a863aec00aa6c9321af95
diff --cc qcsrc/client/View.qc
index 2d9bc563f,083eec1b8..e417ddbed
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@@ -350,8 -350,10 +350,11 @@@ vector freeze_pmove_org, freeze_input_a
  entity nightvision_noise, nightvision_noise2;
  
  float pickup_crosshair_time, pickup_crosshair_size;
 +float use_nex_charge_pool;
  
+ float myhealth, myhealth_prev;
+ float myhealth_flash;
+ 
  void CSQC_UpdateView(float w, float h)
  {
  	entity e;