Commit 34f50a68 authored by Martin Sustrik's avatar Martin Sustrik

Merge branch 'maint'

* maint:
  FD_SETSIZE defaults to 1024 in MSVC build

Conflicts:
	builds/msvc/libzmq/libzmq.vcproj
Signed-off-by: 's avatarMartin Sustrik <sustrik@250bpm.com>
parents bd0ecf47 152c64f2
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment