]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
authorLyberta <lyberta@lyberta.net>
Fri, 17 Mar 2017 20:13:19 +0000 (23:13 +0300)
committerLyberta <lyberta@lyberta.net>
Fri, 17 Mar 2017 20:13:19 +0000 (23:13 +0300)
1  2 
bal-wep-overkill.cfg
qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
qcsrc/common/stats.qh
qcsrc/server/client.qc

Simple merge
Simple merge
Simple merge