]> 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: e8db496 1a1234b)
Merge remote-tracking branch 'origin/Mario/teamswitch_fix'
authorSamual Lenks <samual@xonotic.org>
Sat, 25 Jan 2014 22:05:36 +0000 (17:05 -0500)
committerSamual Lenks <samual@xonotic.org>
Sat, 25 Jan 2014 22:05:36 +0000 (17:05 -0500)
# By Mario
# Via Mario
* origin/Mario/teamswitch_fix:
  Check if the team is available before killing the player


Trivial merge