]> 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: 73d372b 83fec76)
Merge remote-tracking branch 'origin/terencehill/moveplayer_fix'
authorSamual Lenks <samual@xonotic.org>
Wed, 26 Feb 2014 20:27:08 +0000 (15:27 -0500)
committerSamual Lenks <samual@xonotic.org>
Wed, 26 Feb 2014 20:27:08 +0000 (15:27 -0500)
# By terencehill
# Via terencehill
* origin/terencehill/moveplayer_fix:
  CheckAllowedTeams must be called before FindSmallestTeam


Trivial merge