Merge pull request #977 from ros-simulation/backport

[backport] ros2 -> dashing
ros-simulation · Aug 11, 2019 · f5b5a1b · f5b5a1b
2 parents f4cd37b + 890ca64
commit f5b5a1b
Show file tree

Hide file tree

Showing 18 changed files with 690 additions and 530 deletions.
diff --git a/.ros1_unported/gazebo_plugins/include/gazebo_plugins/gazebo_ros_bumper.h b/.ros1_unported/gazebo_plugins/include/gazebo_plugins/gazebo_ros_bumper.h