Commit d59982e3 authored by Joan Vallvé Navarro's avatar Joan Vallvé Navarro
Browse files

Merge branch 'master' into 'devel'

# Conflicts:
#   include/publisher_falko.h
#   include/publisher_laser_map.h
#   include/publisher_odom_icp.h
#   include/subscriber_laser2d.h
#   src/publisher_falko.cpp
#   src/publisher_laser_map.cpp
#   src/publisher_odom_icp.cpp
#   src/subscriber_laser2d.cpp
parents d4816e7e 5019c9a6
Supports Markdown
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