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)
1  2 
qcsrc/client/view.qc
qcsrc/server/client.qc

Simple merge
Simple merge