diff options
| author | Martin Lucina <mato@kotelna.sk> | 2010-09-04 16:24:21 +0200 |
|---|---|---|
| committer | Martin Lucina <mato@kotelna.sk> | 2010-09-04 16:24:21 +0200 |
| commit | ca176121deb8dbdc62d8a37fec377c07fc786480 (patch) | |
| tree | 6b53af092e5de652a6ba92ba771333901930fa62 /src/owned.cpp | |
| parent | 2673a84e07b93b8607958516c55341c2eb220a6e (diff) | |
| parent | 51a84c15ded2d70985c9d971ebdf3f3c9c18d590 (diff) | |
Merge branch 'maint'
* maint:
zmq::select_t, zmq_poll(): assert if FD_SETSIZE reached
zmq.h: Fix typo and use of C99 comment
Conflicts:
src/zmq.cpp
Diffstat (limited to 'src/owned.cpp')
0 files changed, 0 insertions, 0 deletions