Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
authorLyberta <lyberta@lyberta.net>
Thu, 22 Feb 2018 03:38:29 +0000 (06:38 +0300)
committerLyberta <lyberta@lyberta.net>
Thu, 22 Feb 2018 03:38:29 +0000 (06:38 +0300)
commit224f6d8084e73e0e643cb2d9d58c466defa9d134
treef51bfb9f2bc1f342f8c059d484996a1bc8fc7458
parent101c811a51a08305d18ca504af57b5dab1bb16a4
parent203216b3579c2ee41e7598eccc91e1dd2e0b487b
Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
qcsrc/common/mutators/mutator/nades/nades.qc
qcsrc/server/client.qc
qcsrc/server/defs.qh
xonotic-client.cfg
xonotic-server.cfg