Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

H

hpp-manipulation
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

c395a8ea

Commit c395a8ea authored 9 years ago by Joseph Mirabel Committed by Joseph Mirabel 9 years ago

Downloads
- Plain Diff

Merge remote-tracking branch 'hpp/devel' into devel

Conflicts:
	src/problem-solver.cc

parents 57a043e3 4bca67dd

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

include/hpp/manipulation/axial-handle.hh 2 additions, 1 deletion

include/hpp/manipulation/axial-handle.hh
include/hpp/manipulation/problem-solver.hh 9 additions, 0 deletions

include/hpp/manipulation/problem-solver.hh
src/graph/edge.cc 3 additions, 1 deletion

src/graph/edge.cc
src/problem-solver.cc 42 additions, 0 deletions

src/problem-solver.cc
tests/CMakeLists.txt 1 addition, 1 deletion

tests/CMakeLists.txt

with 57 additions and 3 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