From: Samual <samual@xonotic.org>
Date: Thu, 22 Dec 2011 17:56:31 +0000 (-0500)
Subject: Merge remote branch 'origin/master' into samual/updatecommands
X-Git-Tag: xonotic-v0.6.0~188^2~28^2~88
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1f1c714c231334ca941e029e7ab2094fff25b476;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/master' into samual/updatecommands
---

1f1c714c231334ca941e029e7ab2094fff25b476
diff --cc qcsrc/server/progs.src
index 156b6279d,083feb4e2..8bf3f0e1f
--- a/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@@ -38,18 -36,11 +38,18 @@@ campaign.q
  ../common/mapinfo.qh
  ../common/util.qc
  
 +command/common.qh
 +command/ipban.qh
 +command/radarmap.qh
 +command/vote.qh
 +command/cmd.qh
 +command/sv_cmd.qh
 +
  accuracy.qh
  csqcprojectile.qh
- ../csqcmodel/settings.qh
- ../csqcmodel/common.qh
- ../csqcmodel/sv_model.qh
+ ../common/csqcmodel_settings.qh
+ ../csqcmodellib/common.qh
+ ../csqcmodellib/sv_model.qh
  csqceffects.qc
  
  anticheat.qh