Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
authorLyberta <lyberta@lyberta.net>
Thu, 1 Jun 2017 13:09:53 +0000 (16:09 +0300)
committerLyberta <lyberta@lyberta.net>
Thu, 1 Jun 2017 13:09:53 +0000 (16:09 +0300)
commit8a336668045070d910c34b62f80a16c2042a1a7b
tree8f8f47a0ee924a259fd64c6590b9b6486dabb385
parent00a0bc7a2ef3ba8b9c0d7edb1c066b8dac3d0298
parent2243b8d92b2333511af253267a280e2c8f85901f
Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
defaultXonotic.cfg
qcsrc/server/client.qc
qcsrc/server/defs.qh