]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'Lyberta/Survival' into Lyberta/master
authorLyberta <lyberta@lyberta.net>
Sun, 11 Mar 2018 06:15:20 +0000 (09:15 +0300)
committerLyberta <lyberta@lyberta.net>
Sun, 11 Mar 2018 06:15:20 +0000 (09:15 +0300)
1  2 
qcsrc/common/mutators/mutator/nades/nades.qc
qcsrc/common/stats.qh

Simple merge