From: Lyberta <lyberta@lyberta.net>
Date: Mon, 8 Jan 2018 16:09:16 +0000 (+0300)
Subject: Merge branch 'Lyberta/Survival' into Lyberta/master
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e7f099b3a314c830d3d3cb1ff9b4481efe0e7346;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Lyberta/Survival' into Lyberta/master
---

e7f099b3a314c830d3d3cb1ff9b4481efe0e7346
diff --cc qcsrc/client/view.qc
index d3c1314cd6,95a437e926..7808ebce29
--- a/qcsrc/client/view.qc
+++ b/qcsrc/client/view.qc
@@@ -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>