Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

pinocchio
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

77840e8d

Commit 77840e8d authored 8 years ago by Justin Carpentier Committed by GitHub 8 years ago

Downloads
- Plain Diff

Merge pull request #216 from fvalenza/devel

Moved assimp module in hpp-fcl

parents f74083b4 8dbb93c5

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

CMakeLists.txt 2 additions, 7 deletions

CMakeLists.txt
src/CMakeLists.txt 0 additions, 6 deletions

src/CMakeLists.txt
src/multibody/parser/from-collada-to-fcl.hpp 0 additions, 181 deletions

src/multibody/parser/from-collada-to-fcl.hpp
src/multibody/parser/urdf-with-geometry.hxx 11 additions, 4 deletions

src/multibody/parser/urdf-with-geometry.hxx
unittest/CMakeLists.txt 1 addition, 1 deletion

unittest/CMakeLists.txt

with 14 additions and 199 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment