]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commite520d4b32e53462b9e22a2a923f6ba2fe2909226
tree7fdf02278cf78b963c6005f9014ea659caff2a54
parent04692f3bf447ec38a1bbb0a330c288bbe7a42726
parent529205ae72f71a51ad6f1c31a3b2c701007ebb4f
Merge branch 'master' into Lyberta/TeamplayFixes_
qcsrc/server/autocvars.qh
qcsrc/server/client.qc
qcsrc/server/mutators/events.qh
qcsrc/server/teamplay.qc