Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
authorLyberta <lyberta@lyberta.net>
Mon, 8 Jan 2018 16:07:28 +0000 (19:07 +0300)
committerLyberta <lyberta@lyberta.net>
Mon, 8 Jan 2018 16:07:28 +0000 (19:07 +0300)
commit50b66c57de75be33297b4760718c2a8977c5ccbc
tree7fe10a2e761787aaaf36bc65ac25e4ec2e46f7de
parent69ebfd5e7f96727f0e5d628085e686b81da8454a
parent592256dcbdd52ee36778295ce0be2c5a568f6fc6
Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
defaultServer.cfg
qcsrc/client/view.qc
qcsrc/server/client.qc
qcsrc/server/defs.qh