Merge branch 'master' into Mario/fix_me
authorterencehill <piuntn@gmail.com>
Mon, 14 Jan 2019 08:50:15 +0000 (09:50 +0100)
committerterencehill <piuntn@gmail.com>
Mon, 14 Jan 2019 08:50:15 +0000 (09:50 +0100)
commit0dec7bcf5fa101452e59fe30b74daf24251d93e8
tree20883bdea3d3b3d452f613508497c2f53960a0dd
parentc3a146bbe49a9e35e15aeccfb9b48967640cccbc
parent64abe0b411c59b5c75dcef50e5a78b6c02dcfca7
Merge branch 'master' into Mario/fix_me
qcsrc/server/client.qc