]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into Lyberta/RandomItems
authorLyberta <lyberta@lyberta.net>
Sat, 25 Nov 2017 00:34:52 +0000 (03:34 +0300)
committerLyberta <lyberta@lyberta.net>
Sat, 25 Nov 2017 00:34:52 +0000 (03:34 +0300)
1  2 
qcsrc/common/stats.qh
qcsrc/server/defs.qh

Simple merge
Simple merge