From 923731ba383636f6ece926eec9c90d99f13bb030 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20Fr=C3=B6hlich?= Date: Mon, 10 Jun 2024 09:52:10 +0200 Subject: [PATCH 1/2] Giving APT keys in the README (#328) (cherry picked from commit 6150f35b71ed50651ddf1ca237bf5f588f0a0c60) # Conflicts: # README.md --- README.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/README.md b/README.md index 609feb38..1ddc89cb 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,7 @@ More information about `ros2_control` can be found here: https://control.ros.org This package provides a Gazebo-Sim system plugin which instantiates a `ros2_control` controller manager and connects it to a Gazebo model. +<<<<<<< HEAD ROS version | Gazebo version | Branch | Binaries hosted at -- | -- | -- | -- Foxy | Citadel | [foxy](https://github.com/ros-controls/gz_ros2_control/tree/foxy) | https://packages.ros.org @@ -24,6 +25,17 @@ Rolling | Edifice | [master](https://github.com/ros-controls/gz_ros2_control/tre Rolling | Fortress | [master](https://github.com/ros-controls/gz_ros2_control/tree/master) | https://packages.ros.org Rolling | Garden (not released) | [master](https://github.com/ros-controls/gz_ros2_control/tree/master) | only from source Rolling | Harmonic (not released) | [master](https://github.com/ros-controls/gz_ros2_control/tree/master) | only from source +======= +ROS version | Gazebo version | Branch | Binaries hosted at | APT key +-- | -- | -- | -- | -- +Humble | Fortress | [humble](https://github.com/ros-controls/gz_ros2_control/tree/humble) | https://packages.ros.org | `ros-humble-ign-ros2-control` +Iron | Edifice | [iron](https://github.com/ros-controls/gz_ros2_control/tree/iron) | only from source | +Iron | Fortress | [iron](https://github.com/ros-controls/gz_ros2_control/tree/iron) | https://packages.ros.org | `ros-iron-gz-ros2-control` +Iron | Garden | [iron](https://github.com/ros-controls/gz_ros2_control/tree/iron) | only from source | +Iron | Harmonic | [iron](https://github.com/ros-controls/gz_ros2_control/tree/iron) | only from source | +Jazzy | Harmonic | [master](https://github.com/ros-controls/gz_ros2_control/tree/master) | https://packages.ros.org | `ros-jazzy-gz-ros2-control` +Rolling | Harmonic | [master](https://github.com/ros-controls/gz_ros2_control/tree/master) | https://packages.ros.org | `ros-rolling-gz-ros2-control` +>>>>>>> 6150f35 (Giving APT keys in the README (#328)) ## Build status From 73067b7e3c754a5ac973d45ba3e4e2cddeb523dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Hern=C3=A1ndez=20Cordero?= Date: Mon, 10 Jun 2024 10:12:47 +0200 Subject: [PATCH 2/2] Fixed merge MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Alejandro Hernández Cordero --- README.md | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/README.md b/README.md index 1ddc89cb..2d21add8 100644 --- a/README.md +++ b/README.md @@ -9,23 +9,6 @@ More information about `ros2_control` can be found here: https://control.ros.org This package provides a Gazebo-Sim system plugin which instantiates a `ros2_control` controller manager and connects it to a Gazebo model. -<<<<<<< HEAD -ROS version | Gazebo version | Branch | Binaries hosted at --- | -- | -- | -- -Foxy | Citadel | [foxy](https://github.com/ros-controls/gz_ros2_control/tree/foxy) | https://packages.ros.org -Foxy | Edifice | [foxy](https://github.com/ros-controls/gz_ros2_control/tree/foxy) | only from source -Galactic | Edifice | [galactic](https://github.com/ros-controls/gz_ros2_control/tree/galactic) | https://packages.ros.org -Galactic | Fortress | [galactic](https://github.com/ros-controls/gz_ros2_control/tree/galactic) | only from source -Humble | Fortress | [humble](https://github.com/ros-controls/gz_ros2_control/tree/humble) | https://packages.ros.org -Iron | Edifice | [iron](https://github.com/ros-controls/gz_ros2_control/tree/iron) | only from source -Iron | Fortress | [iron](https://github.com/ros-controls/gz_ros2_control/tree/iron) | https://packages.ros.org -Iron | Garden (not released) | [iron](https://github.com/ros-controls/gz_ros2_control/tree/iron) | only from source -Iron | Harmonic (not released) | [iron](https://github.com/ros-controls/gz_ros2_control/tree/iron) | only from source -Rolling | Edifice | [master](https://github.com/ros-controls/gz_ros2_control/tree/master) | only from source -Rolling | Fortress | [master](https://github.com/ros-controls/gz_ros2_control/tree/master) | https://packages.ros.org -Rolling | Garden (not released) | [master](https://github.com/ros-controls/gz_ros2_control/tree/master) | only from source -Rolling | Harmonic (not released) | [master](https://github.com/ros-controls/gz_ros2_control/tree/master) | only from source -======= ROS version | Gazebo version | Branch | Binaries hosted at | APT key -- | -- | -- | -- | -- Humble | Fortress | [humble](https://github.com/ros-controls/gz_ros2_control/tree/humble) | https://packages.ros.org | `ros-humble-ign-ros2-control` @@ -35,7 +18,6 @@ Iron | Garden | [iron](https://github.com/ros-controls/gz_ros2_control/tree/iron Iron | Harmonic | [iron](https://github.com/ros-controls/gz_ros2_control/tree/iron) | only from source | Jazzy | Harmonic | [master](https://github.com/ros-controls/gz_ros2_control/tree/master) | https://packages.ros.org | `ros-jazzy-gz-ros2-control` Rolling | Harmonic | [master](https://github.com/ros-controls/gz_ros2_control/tree/master) | https://packages.ros.org | `ros-rolling-gz-ros2-control` ->>>>>>> 6150f35 (Giving APT keys in the README (#328)) ## Build status