]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commitfd693e8de2eb31ad52a8d165f10e77bb06116a1b
tree5a01cd466914e816e13bf3423ec9e8adbbb155fd
parentcfed0689e0277396cc2058d14dabee2c93834dbe
parent5a86a0b7fd6e9226f7e0816f54213ef62cd99dba
Merge branch 'master' into Lyberta/TeamplayOverhaul
qcsrc/server/client.qc
qcsrc/server/defs.qh
qcsrc/server/scores_rules.qc