Skip to content
Snippets Groups Projects
Commit cd31876c authored by Kelsey's avatar Kelsey
Browse files

Merge branch 'moveit-plugin-devel' into ur10_moveit

Conflicts:
	ur_description/urdf/ur10.urdf.xacro
parents 953d0465 f9b1fc39
Branches
Tags
No related merge requests found
Showing
with 1311 additions and 29 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment