Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
authorLyberta <lyberta@lyberta.net>
Wed, 4 Apr 2018 16:50:11 +0000 (19:50 +0300)
committerLyberta <lyberta@lyberta.net>
Wed, 4 Apr 2018 16:50:11 +0000 (19:50 +0300)
commitf41f81f37e3ecf5a2d14f7bc7ffd7bbf09fff32e
treef62878644bdff4e52ab8d8d8aa4ddd95f514a1c1
parent224f6d8084e73e0e643cb2d9d58c466defa9d134
parent71636e8f68cd31db1aabb442259a11c3bb3b3866
Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
bal-wep-overkill.cfg
bal-wep-xonotic.cfg
qcsrc/client/view.qc
qcsrc/common/mutators/mutator/nades/nades.qc
qcsrc/common/wepent.qc
qcsrc/server/client.qc
qcsrc/server/defs.qh
xonotic-server.cfg