Merge branch 'master' into terencehill/min_spec_time 524/head
authorterencehill <piuntn@gmail.com>
Wed, 30 May 2018 12:44:23 +0000 (14:44 +0200)
committerterencehill <piuntn@gmail.com>
Wed, 30 May 2018 12:44:23 +0000 (14:44 +0200)
1  2 
qcsrc/server/client.qc
qcsrc/server/client.qh
qcsrc/server/mutators/events.qh

Simple merge
Simple merge
Simple merge