Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
authorLyberta <lyberta@lyberta.net>
Thu, 29 Jun 2017 11:52:57 +0000 (14:52 +0300)
committerLyberta <lyberta@lyberta.net>
Thu, 29 Jun 2017 11:52:57 +0000 (14:52 +0300)
1  2 
bal-wep-overkill.cfg
defaultXonotic.cfg
qcsrc/client/view.qc
qcsrc/common/stats.qh
qcsrc/server/client.qc
qcsrc/server/defs.qh

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