Merge branch 'ur10_urdf_update' into ur10_moveit (fc25d02b) · Commits · bigprint / universal_robot

Snippets Groups Projects

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens, and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption in our documentation.

Commit fc25d02b authored 10 years ago by

hyatt

Browse files

Merge branch 'ur10_urdf_update' into ur10_moveit

Conflicts:
	ur_description/urdf/ur10.urdf.xacro
	ur_description/urdf/ur10_joint_limited.urdf.xacro

parents c8d0a332 7ba58372

Hide whitespace changes

Inline Side-by-side

Showing with 299 additions and 404 deletions

Please register or to comment

Admin message

Merge branch 'ur10_urdf_update' into ur10_moveit