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

Merge from cob3-3 calibration user #37

Merged
merged 17 commits into from Dec 9, 2013
Merged

Conversation

ipa-nhg
Copy link
Member

@ipa-nhg ipa-nhg commented Dec 9, 2013

No description provided.

ipa-robotino and others added 17 commits April 23, 2013 10:16
…into groovy_dev

Conflicts:
	cob3-5/calibration/calibration_offset.urdf.xacro
…into groovy_dev

Conflicts:
	cob3-5/calibration/calibration_default.urdf.xacro
@ipa-nhg
Copy link
Member Author

ipa-nhg commented Dec 9, 2013

visual Review -> OK

@floweisshardt
Copy link
Member

visual review: ok

floweisshardt pushed a commit that referenced this pull request Dec 9, 2013
Merge from cob3-3 calibration user
@floweisshardt floweisshardt merged commit cbf2953 into ipa320:groovy_dev Dec 9, 2013
@ipa-nhg ipa-nhg deleted the merge branch June 23, 2014 09:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants