]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into Lyberta/PlayerTemplates
authorLyberta <lyberta@lyberta.net>
Mon, 11 Jun 2018 10:12:33 +0000 (13:12 +0300)
committerLyberta <lyberta@lyberta.net>
Mon, 11 Jun 2018 10:12:33 +0000 (13:12 +0300)
1  2 
qcsrc/server/_mod.inc
qcsrc/server/_mod.qh

Simple merge
Simple merge