Merge branch 'master' into terencehill/min_spec_time
authorterencehill <piuntn@gmail.com>
Fri, 6 Apr 2018 19:44:53 +0000 (21:44 +0200)
committerterencehill <piuntn@gmail.com>
Fri, 6 Apr 2018 19:44:53 +0000 (21:44 +0200)
commitd01c567581179df7cc68bcdc8dce58efad911bc4
tree08fc328b969682e031a345a469a5e5439d113328
parent43f73d2d2d8cbd1c5656a327b5c9e9d99b1da6c7
parent1852dd0b6c285f4c8d44e08efb6c9ea0709658eb
Merge branch 'master' into terencehill/min_spec_time
qcsrc/server/client.qc
qcsrc/server/mutators/events.qh
qcsrc/server/mutators/mutator/gamemode_lms.qc