]> 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 | compact (merge: d4f1b4c 55f9fb4)
Merge remote-tracking branch 'origin/Mario/teamswitch_fix2'
authorRudolf Polzer <divverent@xonotic.org>
Wed, 4 Jun 2014 09:23:04 +0000 (11:23 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Wed, 4 Jun 2014 09:23:04 +0000 (11:23 +0200)
* origin/Mario/teamswitch_fix2:
  Check allowed teams before counting them
  Team counting requires numbers instead of team IDs


Trivial merge