From: Lyberta <lyberta@lyberta.net>
Date: Mon, 8 Jan 2018 16:07:28 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
X-Git-Tag: xonotic-v0.8.5~2119^2~45
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=50b66c57de75be33297b4760718c2a8977c5ccbc;p=xonotic%2Fxonotic-data.pk3dir.git

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

50b66c57de75be33297b4760718c2a8977c5ccbc
diff --cc qcsrc/client/view.qc
index d3c1314cd,95a437e92..7808ebce2
--- 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>