diff options
| author | Martin Sustrik <sustrik@250bpm.com> | 2010-09-04 17:19:38 +0200 |
|---|---|---|
| committer | Martin Sustrik <sustrik@250bpm.com> | 2010-09-04 17:19:38 +0200 |
| commit | 76f2e5d5442d3200c8ca09681a887830775c84c0 (patch) | |
| tree | 5de219c76d701b5d58643f35a8090ea9086db0d3 /src/swap.cpp | |
| parent | ca176121deb8dbdc62d8a37fec377c07fc786480 (diff) | |
| parent | db7fe858d6356988fb9a9270c235178e523b2370 (diff) | |
Merge branch 'maint'
* maint:
Broken device numbering reverted
assert on malformed messages
forwarder and streamer devices handle multi-part messages correctly
improved null checking in zmq_term
Conflicts:
AUTHORS
include/zmq.h
src/zmq.cpp
Diffstat (limited to 'src/swap.cpp')
0 files changed, 0 insertions, 0 deletions