Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
authorLyberta <lyberta@lyberta.net>
Tue, 24 Apr 2018 19:09:38 +0000 (22:09 +0300)
committerLyberta <lyberta@lyberta.net>
Tue, 24 Apr 2018 19:09:38 +0000 (22:09 +0300)
1  2 
qcsrc/client/view.qc
qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
qcsrc/server/client.qc
qcsrc/server/defs.qh
xonotic-server.cfg

Simple merge
Simple merge
Simple merge
Simple merge