]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into Lyberta/TeamplayOverhaul
authorLyberta <lyberta@lyberta.net>
Thu, 8 Mar 2018 15:15:36 +0000 (18:15 +0300)
committerLyberta <lyberta@lyberta.net>
Thu, 8 Mar 2018 15:15:36 +0000 (18:15 +0300)
1  2 
qcsrc/server/client.qc
qcsrc/server/defs.qh
qcsrc/server/scores_rules.qc

Simple merge
Simple merge
Simple merge