]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Lyberta/TeamplayFixes_
authorLyberta <lyberta@lyberta.net>
Sun, 2 Apr 2017 14:57:47 +0000 (17:57 +0300)
committerLyberta <lyberta@lyberta.net>
Sun, 2 Apr 2017 14:57:47 +0000 (17:57 +0300)
commit8ab019133d20ec2f8291f85ad7ff2d58ba4594d0
tree1e3b5e6c6319186bf8da02b6c8b1c4ec1a8e17e4
parent2974419ec9dbc3457a02d8644ed1702d14fca970
parentaf7ecbff777859dbf824f2de864d736936b0a12c
Merge branch 'master' into Lyberta/TeamplayFixes_
qcsrc/server/client.qc
qcsrc/server/mutators/events.qh