Merge branch 'maint'

Browse Source

* maint:
  FD_SETSIZE defaults to 1024 in MSVC build

Conflicts:
	builds/msvc/libzmq/libzmq.vcproj

Signed-off-by: Martin Sustrik <sustrik@250bpm.com>

...

This commit is contained in:

Martin Sustrik 2010-11-16 14:26:04 +01:00

parent bd0ecf4784 152c64f25d

commit 34f50a6840

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available