From: Samual Lenks <samual@xonotic.org>
Date: Wed, 26 Feb 2014 20:33:35 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/Mario/spawnsystem_mutator'
X-Git-Tag: xonotic-v0.8.0~226^2~4
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1b033ed5a6101aabd7bc99ece956e18508c478ab;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/Mario/spawnsystem_mutator'

# By Mario
# Via Mario
* origin/Mario/spawnsystem_mutator:
  Fix compile error
  Merge spawnsystem into the existing mutator
  Move overkill's spawn system into a separate mutator
---

1b033ed5a6101aabd7bc99ece956e18508c478ab