From: Mario <mario.mario@y7mail.com>
Date: Tue, 14 May 2013 02:53:01 +0000 (+1000)
Subject: Merge branch 'master' into Mario/monsters
X-Git-Tag: xonotic-v0.8.0~241^2^2~236
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a9fd8f699cad3e52b829a99864db55228354e021;p=xonotic%2Fxonotic-data.pk3dir.git

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

a9fd8f699cad3e52b829a99864db55228354e021
diff --cc qcsrc/server/progs.src
index 2d52f4235,df5623f05..acf174960
--- a/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@@ -202,10 -199,10 +204,12 @@@ vehicles/vehicles.q
  
  scores.qc
  
+ spawnpoints.qc
+ 
  portals.qc
  
 +generator.qc
 +
  target_spawn.qc
  func_breakable.qc
  target_music.qc