]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c1ca8fe 53ecb52)
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)
# By Mario
# Via Mario
* origin/Mario/teams_override:
  Remove keepaway team cvars from config

1  2 
gamemodes.cfg patch | diff1 | diff2 | blob | history

diff --cc gamemodes.cfg
Simple merge