Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
authorLyberta <lyberta@lyberta.net>
Wed, 10 May 2017 12:40:55 +0000 (15:40 +0300)
committerLyberta <lyberta@lyberta.net>
Wed, 10 May 2017 12:40:55 +0000 (15:40 +0300)
commit00a0bc7a2ef3ba8b9c0d7edb1c066b8dac3d0298
tree8b607e2260417c8b22ec22e01cf36c74036fec82
parent0d3433983a92ad80893fd18781e01a99857e94c1
parent44182002afcc9fdeca93c8296185258d374f6513
Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
qcsrc/client/view.qc
qcsrc/server/client.qc