Merge remote-tracking branch 'origin/samual/warmup_onlyonmap'
authorSamual Lenks <samual@xonotic.org>
Thu, 17 Oct 2013 20:31:49 +0000 (16:31 -0400)
committerSamual Lenks <samual@xonotic.org>
Thu, 17 Oct 2013 20:31:49 +0000 (16:31 -0400)
commit7ca9f7048fbb405c0c814bcf58648049424cee22
treee85f584b299e6ed713a1a3c4518e3b47ac6a4948
parentb0e190996cd575ce487f9297d0207f1b0355ecbf
parentad1729bd8b56b054466689731f0a2f59f13e55ee
Merge remote-tracking branch 'origin/samual/warmup_onlyonmap'

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