Merge branch 'main' into ci_matching_branch/bump_harmonic_gz-sensors8

gazebosim · Aug 4, 2023 · 9506b39 · 9506b39
2 parents 31bbc45 + d649800
commit 9506b39
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 33 deletions.
diff --git a/src/Lidar.cc b/src/Lidar.cc
@@ -245,7 +245,7 @@ bool Lidar::PublishLidarScan(const std::chrono::steady_clock::duration &_now)
   frame->set_key("frame_id");
   // keeping here the sensor name instead of frame_id because the visualizeLidar
   // plugin relies on this value to get the position of the lidar.
-  // the ros_ign plugin is using the laserscan.proto 'frame' field
+  // the ros_gz plugin is using the laserscan.proto 'frame' field
   frame->add_value(this->Name());
   this->dataPtr->laserMsg.set_frame(this->FrameId());
 

diff --git a/test/integration/deprecated_TEST.cc b/test/integration/deprecated_TEST.cc