]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'Lyberta/RandomItems' into Lyberta/PlayerTemplates
authorLyberta <lyberta@lyberta.net>
Thu, 5 Oct 2017 13:24:59 +0000 (16:24 +0300)
committerLyberta <lyberta@lyberta.net>
Thu, 5 Oct 2017 13:24:59 +0000 (16:24 +0300)
1  2 
qcsrc/server/_mod.inc
qcsrc/server/_mod.qh

Simple merge
Simple merge