From: Samual Lenks <samual@xonotic.org>
Date: Thu, 17 Oct 2013 20:31:49 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/samual/warmup_onlyonmap'
X-Git-Tag: xonotic-v0.8.0~278
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7ca9f7048fbb405c0c814bcf58648049424cee22;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/samual/warmup_onlyonmap'

* origin/samual/warmup_onlyonmap:
  Add feature to warmup_allguns which only provides weapons in the map
---

7ca9f7048fbb405c0c814bcf58648049424cee22