evoskuil 5a76db6f27 Merge branch 'zeromq/master' ... Conflicts: builds/msvc/vs2010/inproc_lat/inproc_lat.props builds/msvc/vs2010/inproc_thr/inproc_thr.props builds/msvc/vs2010/libsodium.import.props builds/msvc/vs2010/libzmq.import.props builds/msvc/vs2010/libzmq/libzmq.props builds/msvc/vs2010/local_lat/local_lat.props builds/msvc/vs2010/local_thr/local_thr.props builds/msvc/vs2010/properties/Common.props builds/msvc/vs2010/properties/Console.props builds/msvc/vs2010/properties/ConsoleDebugDynamic.props builds/msvc/vs2010/properties/ConsoleDebugLinkTimeCodeGeneration.props builds/msvc/vs2010/properties/ConsoleDebugStatic.props builds/msvc/vs2010/properties/ConsoleReleaseDynamic.props builds/msvc/vs2010/properties/ConsoleReleaseLinkTimeCodeGeneration.props builds/msvc/vs2010/properties/ConsoleReleaseStatic.props builds/msvc/vs2010/properties/Debug.props builds/msvc/vs2010/properties/Dynamic.props builds/msvc/vs2010/properties/DynamicDebug.props builds/msvc/vs2010/properties/DynamicRelease.props builds/msvc/vs2010/properties/LinkTimeCodeGeneration.props builds/msvc/vs2010/properties/Release.props builds/msvc/vs2010/properties/Static.props builds/msvc/vs2010/properties/StaticDebug.props builds/msvc/vs2010/properties/StaticDebugLinkTimeCodeGeneration.props builds/msvc/vs2010/properties/StaticLinkTimeCodeGeneration.props builds/msvc/vs2010/properties/StaticRelease.props builds/msvc/vs2010/properties/StaticReleaseLinkTimeCodeGeneration.props builds/msvc/vs2010/properties/Win32.props builds/msvc/vs2010/properties/x64.props builds/msvc/vs2010/remote_lat/remote_lat.props builds/msvc/vs2010/remote_thr/remote_thr.props		2014-04-14 23:47:55 -07:00
..
cmake	cmake: fix fragile code related to HAVE_FORK macro	2014-03-18 21:07:45 +01:00
mingw32	Remove duplicate poller decision making	2014-02-17 14:08:11 +01:00
msvc	Merge branch 'zeromq/master'	2014-04-14 23:47:55 -07:00
nuget	updated with better owner, author and copyright information	2014-03-25 17:34:09 -05:00
redhat	deprecate zmq_ctx_destroy in favor of zmq_ctx_term	2013-01-17 15:48:18 -08:00
valgrind	Fixed issue #348	2012-03-26 16:31:12 -05:00