Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Renamed ign to gz (backport #67) #126

Open
wants to merge 2 commits into
base: humble
Choose a base branch
from
Open

Commits on Mar 1, 2023

  1. Renamed ign to gz (#67)

    Signed-off-by: Alejandro Hernández Cordero <[email protected]>
    (cherry picked from commit ab810e7)
    
    # Conflicts:
    #	.github/workflows/ci.yaml
    #	Dockerfile/Dockerfile
    #	README.md
    #	gz_ros2_control/src/gz_ros2_control_plugin.cpp
    #	gz_ros2_control/src/gz_system.cpp
    #	gz_ros2_control_demos/config/gripper_controller.yaml
    #	gz_ros2_control_demos/examples/example_gripper.cpp
    #	gz_ros2_control_demos/launch/cart_example_effort.launch.py
    #	gz_ros2_control_demos/launch/cart_example_position.launch.py
    #	gz_ros2_control_demos/launch/cart_example_velocity.launch.py
    #	gz_ros2_control_demos/launch/diff_drive_example.launch.py
    #	gz_ros2_control_demos/launch/gripper_mimic_joint_example.launch.py
    #	gz_ros2_control_demos/launch/tricycle_drive_example.launch.py
    #	gz_ros2_control_demos/package.xml
    #	gz_ros2_control_demos/urdf/test_gripper_mimic_joint.xacro.urdf
    #	ign_ros2_control/package.xml
    ahcorde authored and mergify[bot] committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    0a0a34a View commit details
    Browse the repository at this point in the history
  2. resolve conflicts

    destogl committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    f7e10c3 View commit details
    Browse the repository at this point in the history