Merge `master` into `develop`

cyberbotics / webots_ros

Webots ROS package

88 stars 39 forks source link

Merge `master` into `develop` #111

Closed ad-daniel closed 2 years ago

ad-daniel commented 2 years ago

Conflicts:

src/robot_information_parser.cpp

ad-daniel commented 2 years ago

I've restored the formatting, I will create a separate PR to introduce clang format to ros/ros2. I've also updated the reference here https://github.com/cyberbotics/webots/pull/4395, so the PR will required another approval.