From: Mario <zacjardine@y7mail.com>
Date: Thu, 28 Jul 2016 15:02:30 +0000 (+0000)
Subject: Merge branch 'Mario/teams_bitflag' into 'master'
X-Git-Tag: xonotic-v0.8.2~700^2~10
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=87cbf00c7734cf2910502c217b5c5157511ba5ea;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/teams_bitflag' into 'master'

Merge branch Mario/teams_bitflag (M merge request)

Adds support for odd team matches, such as pink vs blue and yellow vs red.

See merge request !335
---

87cbf00c7734cf2910502c217b5c5157511ba5ea