]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'Lyberta/PlayerTemplates' into Lyberta/Survival
authorLyberta <lyberta@lyberta.net>
Fri, 9 Mar 2018 11:41:27 +0000 (14:41 +0300)
committerLyberta <lyberta@lyberta.net>
Fri, 9 Mar 2018 11:41:27 +0000 (14:41 +0300)
1  2 
qcsrc/common/stats.qh
qcsrc/menu/xonotic/util.qc

Simple merge
Simple merge