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

Devel #28

Open
wants to merge 29 commits into
base: ascent
Choose a base branch
from
Open

Devel #28

wants to merge 29 commits into from

Conversation

jbohren
Copy link
Member

@jbohren jbohren commented Nov 19, 2015

No description provided.

zchen24 and others added 29 commits November 11, 2014 14:51
added XENOMAI_ROOT_DIR to readme
Conflicts:
	models/manipulation_platform.urdf.xacro
fixing platform color and marker control
Teleop fixes: color and gitignore
syncing devel and master
adding some lua fixes; removing logwarn with twist
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.

3 participants