Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
authorLyberta <lyberta@lyberta.net>
Wed, 27 Sep 2017 09:50:40 +0000 (12:50 +0300)
committerLyberta <lyberta@lyberta.net>
Wed, 27 Sep 2017 09:50:40 +0000 (12:50 +0300)
1  2 
defaultServer.cfg
qcsrc/server/client.qc

Simple merge
Simple merge