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 changes from jade-devel into indigo-devel #350

Merged
merged 1 commit into from
Aug 15, 2015

Conversation

j-rivero
Copy link
Contributor

The process of merging is not fully automatic, please give it a look. The whole thing compile for me with gazebo6 on trusty/indigo.

Related to issue #349.

j-rivero added a commit that referenced this pull request Aug 15, 2015
…jade

Merge changes from jade-devel into indigo-devel
@j-rivero j-rivero merged commit fa99807 into indigo-devel Aug 15, 2015
@scpeters scpeters deleted the indigo-devel_merged_from_jade branch April 25, 2016 19:40
cohen39 pushed a commit to cohen39/gazebo_ros_pkgs that referenced this pull request Nov 15, 2021
…l_merged_from_jade

Merge changes from jade-devel into indigo-devel
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

1 participant