]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: ffb677b 68d4eee)
Merge branch 'martin-t/msnt' into 'master'
authorMario <zacjardine@y7mail.com>
Tue, 29 Nov 2016 14:01:37 +0000 (14:01 +0000)
committerMario <zacjardine@y7mail.com>
Tue, 29 Nov 2016 14:01:37 +0000 (14:01 +0000)
Spawning near teammates: don't spawn on chatting players

See merge request !392


Trivial merge