]> 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: b993b74 54f5e36)
Merge branch 'Lyberta/TeamplayOverhaul' into 'master'
authorMario <zacjardine@y7mail.com>
Mon, 16 Jul 2018 04:41:22 +0000 (04:41 +0000)
committerMario <zacjardine@y7mail.com>
Mon, 16 Jul 2018 04:41:22 +0000 (04:41 +0000)
Teamplay overhaul - step 1

See merge request xonotic/xonotic-data.pk3dir!538


Trivial merge