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

update issue url https://github.com/ros/robot_model/pull/68 #395

Merged
merged 1 commit into from
Apr 17, 2014

Conversation

k-okada
Copy link
Member

@k-okada k-okada commented Apr 17, 2014

k-okada added a commit that referenced this pull request Apr 17, 2014
@k-okada k-okada merged commit b923a02 into jsk-ros-pkg:master Apr 17, 2014
@garaemon
Copy link
Member

https://travis-ci.org/jsk-ros-pkg/jsk_control/jobs/23184244#L8766

[  5%] HEAD is now at 36ef729 Merge pull request #68 from YoheiKakiuchi/hydro-devel-store-original-mesh-name
patching file collada_urdf/src/collada_urdf.cpp
Reversed (or previously applied) patch detected!  Assume -R? [n] 
Apply anyway? [n] 
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file collada_urdf/src/collada_urdf.cpp.rej
[  5%] make[3]: *** [patched] Error 1
make[2]: *** [/home/travis/ros/ws_jsk_control/devel/lib/collada_urdf_jsk_patch/urdf_to_collada] Error 2
make[1]: *** [jsk-ros-pkg/jsk_common/jsk_ros_patch/collada_urdf_jsk_patch/CMakeFiles/urdf_to_collada.dir/all] Error 2
make[1]: *** Waiting for unfinished jobs....

because of this patch?
jsk-ros-pkg/jsk_control#20

@k-okada
Copy link
Member Author

k-okada commented Apr 17, 2014

i think this is already fixed,#396, they merged our PR very quickly.

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.

2 participants