]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 78a337e ad1fc03)
Merge branch 'martin-t/shuffleteams' into 'master'
authorMario <zacjardine@y7mail.com>
Sat, 31 Dec 2016 05:18:36 +0000 (05:18 +0000)
committerMario <zacjardine@y7mail.com>
Sat, 31 Dec 2016 05:18:36 +0000 (05:18 +0000)
Fix shuffleteams

Closes #1822

See merge request !393


Trivial merge