]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into Lyberta/TeamplayFixes_
authorLyberta <lyberta@lyberta.net>
Sat, 2 Sep 2017 18:53:41 +0000 (21:53 +0300)
committerLyberta <lyberta@lyberta.net>
Sat, 2 Sep 2017 18:53:41 +0000 (21:53 +0300)
1  2 
qcsrc/server/autocvars.qh
qcsrc/server/client.qc
qcsrc/server/mutators/events.qh
qcsrc/server/teamplay.qc

Simple merge
Simple merge
Simple merge
Simple merge