]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'Lyberta/PlayerTemplates' into Lyberta/Survival
authorLyberta <lyberta@lyberta.net>
Sat, 17 Feb 2018 16:37:51 +0000 (19:37 +0300)
committerLyberta <lyberta@lyberta.net>
Sat, 17 Feb 2018 16:37:51 +0000 (19:37 +0300)
1  2 
qcsrc/common/stats.qh
qcsrc/server/g_world.qc

Simple merge
Simple merge