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

Merge branch 'devel' of 

ssh://git@gitlab.iri.upc.edu:2202/mobile_robotics/wolf_projects/wolf_lib/plugins/imu.git
into devel

Conflicts:
	include/IMU/sensor/sensor_IMU.h
	src/sensor/sensor_IMU.cpp
parents 0dd4e114 f9321b8d
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
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