]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into Lyberta/GunGame
authorLyberta <lyberta@lyberta.net>
Thu, 22 Feb 2018 03:37:37 +0000 (06:37 +0300)
committerLyberta <lyberta@lyberta.net>
Thu, 22 Feb 2018 03:37:37 +0000 (06:37 +0300)
1  2 
qcsrc/common/stats.qh
qcsrc/server/g_world.qc

Simple merge
Simple merge