Skip to content
Snippets Groups Projects
Commit e3d7d729 authored by Joan Vallvé Navarro's avatar Joan Vallvé Navarro
Browse files

Merge branch 'main' into 'devel' 

# Conflicts:
#   include/core/capture/capture_landmarks_external.h
#   include/core/processor/processor_landmark_external.h
parents 896e2f6a 892015fd
No related branches found
No related tags found
Checking pipeline status
Hide whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 additions and 0 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment