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

Simple merge