]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'Lyberta/StandaloneOverkillWeapons' into Lyberta/master
authorLyberta <lyberta@lyberta.net>
Mon, 13 Mar 2017 12:31:47 +0000 (15:31 +0300)
committerLyberta <lyberta@lyberta.net>
Mon, 13 Mar 2017 12:31:47 +0000 (15:31 +0300)
1  2 
qcsrc/common/stats.qh
qcsrc/server/client.qc

Simple merge
Simple merge