diff options
| author | Martin Sustrik <sustrik@250bpm.com> | 2010-10-16 00:49:01 +0200 |
|---|---|---|
| committer | Martin Sustrik <sustrik@250bpm.com> | 2010-10-16 00:49:01 +0200 |
| commit | ae5a3c8a99a30b54d0b079bbd98be286685056e8 (patch) | |
| tree | 4d327668f71d921a3c857973687524097a734f70 /src/io_object.hpp | |
| parent | 18d46c81047fc2f8449a5b4ff3e41cc25bd1cfc2 (diff) | |
| parent | 710615cdab8c8e500c259bb27df2af70f5ae8275 (diff) | |
Merge branch 'maint'
* maint:
Version number increased.
Conflicts:
include/zmq.h
Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
Diffstat (limited to 'src/io_object.hpp')
0 files changed, 0 insertions, 0 deletions