1. 27 Apr, 2014 1 commit
  2. 26 Apr, 2014 1 commit
  3. 25 Apr, 2014 6 commits
  4. 24 Apr, 2014 21 commits
  5. 17 Apr, 2014 1 commit
  6. 15 Apr, 2014 4 commits
    • evoskuil's avatar
      Update filter file tool versions. · 1ee980c1
      evoskuil authored
      1ee980c1
    • evoskuil's avatar
      Merge branch 'zeromq/master' · 5a76db6f
      evoskuil authored
      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
      5a76db6f
    • evoskuil's avatar
      Fix platform tools versioning on project files. · d03a1b0d
      evoskuil authored
      d03a1b0d
    • evoskuil's avatar
      Remove versioning from VS .props files. · bd45b74d
      evoskuil authored
      bd45b74d
  7. 14 Apr, 2014 6 commits