]> 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: 2ea0c61 5aad7fb)
Merge branch 'terencehill/shuffleteams_fix' into 'master'
authorMario <zacjardine@y7mail.com>
Thu, 9 Jul 2015 08:27:12 +0000 (08:27 +0000)
committerMario <zacjardine@y7mail.com>
Thu, 9 Jul 2015 08:27:12 +0000 (08:27 +0000)
shuffleteams: properly detect ca players. It fixes #1471 "Shuffleteams results in uneven teams (CA)"

See merge request !136


Trivial merge