Merge remote branch 'origin/fruitiex/csqc_polyblend'
authorRudolf Polzer <divverent@alientrap.org>
Thu, 18 Nov 2010 06:27:49 +0000 (07:27 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 18 Nov 2010 06:27:49 +0000 (07:27 +0100)
1  2 
defaultXonotic.cfg
qcsrc/client/View.qc

Simple merge
@@@ -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;