• Patrik Huber's avatar
    Merge branch 'devel' · 5fe5a737
    Patrik Huber authored
    # Resolved conflicts:
    #	include/eos/fitting/RenderingParameters.hpp
    #	include/eos/fitting/contour_correspondence.hpp
    5fe5a737
contour_correspondence.hpp 16 KB