Merge remote-tracking branch 'origin/Mario/teams_override'
authorSamual Lenks <samual@xonotic.org>
Wed, 26 Feb 2014 20:38:55 +0000 (15:38 -0500)
committerSamual Lenks <samual@xonotic.org>
Wed, 26 Feb 2014 20:38:55 +0000 (15:38 -0500)
commitdaaa53f974bdb4cdf8ec00714eae77d2bdd5e128
tree4a892b3dd06467a04c844a891acebebea7321016
parentc1ca8fe324d3d3a5facbdc70857eaa4b3be88ece
parent53ecb52aa20c3197528dd17bbcb14b70a422be37
Merge remote-tracking branch 'origin/Mario/teams_override'

# By Mario
# Via Mario
* origin/Mario/teams_override:
  Remove keepaway team cvars from config
gamemodes.cfg