]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Lyberta/PlayerTemplates
authorLyberta <lyberta@lyberta.net>
Mon, 16 Jul 2018 12:27:30 +0000 (15:27 +0300)
committerLyberta <lyberta@lyberta.net>
Mon, 16 Jul 2018 12:27:30 +0000 (15:27 +0300)
commitf6dc194f6394a97881b890a7f07eadd60e00591e
treec0aba520bd80f0cd63ff3914618aba85aa7df995
parent93b443eaf10841da4e188a3d86b7f4de0acfcb97
parentaa1c87cd3f79ddaf4e45ebf9428293cfdf2d6733
Merge branch 'master' into Lyberta/PlayerTemplates
qcsrc/server/_mod.inc
qcsrc/server/_mod.qh