]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into Lyberta/TeamplayFixes_
authorLyberta <lyberta@lyberta.net>
Wed, 5 Jul 2017 23:13:00 +0000 (02:13 +0300)
committerLyberta <lyberta@lyberta.net>
Wed, 5 Jul 2017 23:13:00 +0000 (02:13 +0300)
1  2 
qcsrc/server/autocvars.qh
qcsrc/server/client.qc
qcsrc/server/player.qc

Simple merge
Simple merge
Simple merge