diff options
| author | Martin Sustrik <sustrik@250bpm.com> | 2010-11-16 14:26:04 +0100 |
|---|---|---|
| committer | Martin Sustrik <sustrik@250bpm.com> | 2010-11-16 14:26:04 +0100 |
| commit | 34f50a6840fdf638bbd7887aa2438006baeb884d (patch) | |
| tree | 75b128ba6f4d10c0296ca0fc2c9ad5b8435f4e45 /Makefile.am | |
| parent | bd0ecf478466b27103af92db33ffebc3948f2e4e (diff) | |
| parent | 152c64f25df9d037e7f51874d2d66724337aad38 (diff) | |
Merge branch 'maint'
* maint:
FD_SETSIZE defaults to 1024 in MSVC build
Conflicts:
builds/msvc/libzmq/libzmq.vcproj
Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
Diffstat (limited to 'Makefile.am')
0 files changed, 0 insertions, 0 deletions