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

ade54d72 · Telford Berkey · 05df7072 · 8e89d116 · ade54d72
Commit ade54d72 authored Feb 05, 2015 by Telford Berkey
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

client.cpp src/client.cpp +1 -2

No files found.
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -99,4 +99,4 @@ void zmq::client_t::xpipe_terminated (pipe_t *pipe_)
 {
    fq.pipe_terminated (pipe_);
    lb.pipe_terminated (pipe_);
-}
\ No newline at end of file
+}