mirror of
https://github.com/zeromq/libzmq.git
synced 2024-12-28 07:58:14 +08:00
5a76db6f27
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