Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
authorLyberta <lyberta@lyberta.net>
Mon, 8 Jan 2018 16:07:28 +0000 (19:07 +0300)
committerLyberta <lyberta@lyberta.net>
Mon, 8 Jan 2018 16:07:28 +0000 (19:07 +0300)
1  2 
defaultServer.cfg
qcsrc/client/view.qc
qcsrc/server/client.qc
qcsrc/server/defs.qh

Simple merge
@@@ -30,8 -30,8 +30,9 @@@
  
  #include <common/vehicles/all.qh>
  #include <common/weapons/_all.qh>
 +#include <common/mutators/mutator/overkill/okvortex.qh>
  #include <common/viewloc.qh>
+ #include <common/triggers/trigger/viewloc.qh>
  #include <common/minigames/cl_minigames.qh>
  #include <common/minigames/cl_minigames_hud.qh>
  
Simple merge
Simple merge