• Mark Winter's avatar
    Merge commit 'develop' · c2e5cf21
    Mark Winter authored
    # Conflicts:
    #	src/MATLAB/+Load/InitializeConstants.m
    #	src/MATLAB/+Segmentation/SegAndTrackDataset.m
    #	src/MATLAB/Segmentor.m
    #	src/c/MTC.sln
    #	src/c/MTC.vcxproj
    #	src/c/MTC/cost.cpp
    #	src/c/MTC/detection.cpp
    #	src/c/MTC/paths.cpp
    c2e5cf21