Skip to content
Snippets Groups Projects
Commit 55f4d95a authored by Joan Solà Ortega's avatar Joan Solà Ortega
Browse files

Merge branch 'devel' into 'capture-motion' 

# Conflicts:
#   include/core/sensor/sensor_diff_drive.h
parents 9ea9e864 e83c49af
No related branches found
No related tags found
1 merge request!318CaptureMotion: replace origin_frame_ptr_ by capture_origin_ptr_.
Pipeline #4304 failed
Stage: build
    This commit is part of merge request !318. Comments created here will be created in the context of that merge request.
    Hide whitespace changes
    Inline Side-by-side
    Showing
    with 106 additions and 111 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