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)
commit645d03a6a20adcccd0c0a1142406c67d3b323408
treeda3e9087fc5d19aff452dcd83ce2824a6b78ca07
parent5761cf6223dd1755d929d0f7398314f2327dd820
parent27343f2044a85725de89ddacefa1c67fde620c59
Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
defaultServer.cfg
qcsrc/server/client.qc