Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
authorLyberta <lyberta@lyberta.net>
Wed, 4 Apr 2018 16:50:11 +0000 (19:50 +0300)
committerLyberta <lyberta@lyberta.net>
Wed, 4 Apr 2018 16:50:11 +0000 (19:50 +0300)
1  2 
bal-wep-overkill.cfg
bal-wep-xonotic.cfg
qcsrc/client/view.qc
qcsrc/common/mutators/mutator/nades/nades.qc
qcsrc/common/wepent.qc
qcsrc/server/client.qc
qcsrc/server/defs.qh
xonotic-server.cfg

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge