]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into Lyberta/GunGame
authorLyberta <lyberta@lyberta.net>
Wed, 4 Apr 2018 16:41:35 +0000 (19:41 +0300)
committerLyberta <lyberta@lyberta.net>
Wed, 4 Apr 2018 16:41:35 +0000 (19:41 +0300)
1  2 
qcsrc/common/stats.qh
qcsrc/menu/xonotic/util.qc

Simple merge
Simple merge