Fix merge conflicts on feature/remove_mav_imu_message

ethz-asl / asctec_mav_framework

Framework for data aquisition and position control to be used with the highlevel processor of Ascending Technologies helicopters

http://www.ros.org/wiki/asctec_mav_framework

36 stars 40 forks source link

Open marija-p opened 8 years ago

marija-p commented 8 years ago

Resolved merge conflicts with feature/remove_mav_imu_message and current master.

@ffurrer @enricgalceran

alexmillane commented 8 years ago

test this please

alexmillane commented 8 years ago

test this please

fmina commented 7 years ago

@marija-p any update on this? should we close it?

marija-p commented 7 years ago

@fmina No idea, we don't use this anymore I think...