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)
commit89f405ba71d1c354dca27a0af246f04fb9ec42e6
tree0fbd0816d1983fe83bf39303d980ebbaed7cbd79
parentdc6ed2bee5f584838bbf2879c8e0914c81dd8687
parent64abbe49fae92a9447d440eab3f705d6dbf9194e
Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
qcsrc/client/view.qc
qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
qcsrc/server/client.qc
qcsrc/server/defs.qh
xonotic-server.cfg