Commit ade54d72 authored by Telford Berkey's avatar Telford Berkey

Merge remote-tracking branch 'remotes/upstream/master'

parents 05df7072 8e89d116
...@@ -99,4 +99,4 @@ void zmq::client_t::xpipe_terminated (pipe_t *pipe_) ...@@ -99,4 +99,4 @@ void zmq::client_t::xpipe_terminated (pipe_t *pipe_)
{ {
fq.pipe_terminated (pipe_); fq.pipe_terminated (pipe_);
lb.pipe_terminated (pipe_); lb.pipe_terminated (pipe_);
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment