From: Mario <mario.mario@y7mail.com>
Date: Fri, 18 Oct 2013 22:40:46 +0000 (+1100)
Subject: Merge branch 'master' into Mario/monsters
X-Git-Tag: xonotic-v0.8.0~241^2^2~33
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=410ff5f6cc4f7d5d8282ba9d93fe6a65d1c74489;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/monsters
---

410ff5f6cc4f7d5d8282ba9d93fe6a65d1c74489
diff --cc qcsrc/menu/progs.src
index 97e17ff3c,4900b9d96..86cb9621c
--- a/qcsrc/menu/progs.src
+++ b/qcsrc/menu/progs.src
@@@ -53,8 -52,5 +53,6 @@@ xonotic/util.q
  ../common/mapinfo.qc
  ../common/items.qc
  ../common/urllib.qc
 +../common/monsters/monsters.qc
  
  ../warpzonelib/mathlib.qc
- 
- ../common/if-this-file-errors-scroll-up-and-fix-the-warnings.fteqccfail