]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commit53e872ae4dc8dfbe10ed92aa30ec5329a491a4ff
treed5c64fda2f5e907e41d0a04b7c50b4c009e64e33
parente8db49653fa21bf88c253145f80b66dfc7a1d277
parent1a1234b37f1d1d3fd764bbc022b42e6598add1fe
Merge remote-tracking branch 'origin/Mario/teamswitch_fix'

# By Mario
# Via Mario
* origin/Mario/teamswitch_fix:
  Check if the team is available before killing the player