Merge remote branch 'origin/fruitiex/csqc_polyblend'

diff --cc defaultXonotic.cfg
Simple merge

diff --cc qcsrc/client/View.qc
index 2d9bc563fb8027a70880e533ee6ea593e8e0dc90,083eec1b888f2eed85ea643e1672c7ec5999c58b..e417ddbed9d136ba018547a368ca78afa6d57803
--- 1/qcsrc/client/View.qc
--- 2/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;