]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'Lyberta/TeamplayFixes2' into Lyberta/master
authorLyberta <lyberta@lyberta.net>
Sat, 2 Dec 2017 15:58:30 +0000 (18:58 +0300)
committerLyberta <lyberta@lyberta.net>
Sat, 2 Dec 2017 15:58:30 +0000 (18:58 +0300)
1  2 
qcsrc/server/client.qc

Simple merge