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)
commitacddeee8ad8acd0099fdd25d5049e302d6246f24
tree82b56a4302e8bc8595795784ab774e38d6f0dec4
parent4dc2084ad47bfe864765967c819363ca3f0418d7
parentcb629436589869f0ac041eb6afb583e778f8e115
Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
bal-wep-overkill.cfg
defaultXonotic.cfg
qcsrc/client/view.qc
qcsrc/common/stats.qh
qcsrc/server/client.qc
qcsrc/server/defs.qh