Merged master.
authorLyberta <lyberta@lyberta.net>
Fri, 4 Aug 2017 22:17:37 +0000 (01:17 +0300)
committerLyberta <lyberta@lyberta.net>
Fri, 4 Aug 2017 22:17:37 +0000 (01:17 +0300)
commit67410278136b3bf6c5437027ab2f39d0da49753c
treec4fa5a77a40e216a11a39161e7426d42bb73b6c3
parent1a463f974e1c026a16a76dd042ebccb1085ad985
parent0071121b663dc3d841a2c28d27c1015899f0f402
Merged master.
defaultXonotic.cfg
qcsrc/client/view.qc
qcsrc/common/mutators/mutator/overkill/rpc.qc
qcsrc/common/stats.qh
qcsrc/common/weapons/weapon/shotgun.qc
qcsrc/server/client.qc
qcsrc/server/defs.qh