]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commit12272b26539adfd5dd62c4c59c397ab12b1114be
tree47ab5541361c070dfb9ad61137810943c7f5a4b8
parent2ea0c61448fe435ecc8ff255b1fd9bd482ed41fe
parent5aad7fb6cd91e7da6bc6479322f69991b8fe8db1
Merge branch 'terencehill/shuffleteams_fix' into 'master'

shuffleteams: properly detect ca players. It fixes #1471 "Shuffleteams results in uneven teams (CA)"

See merge request !136