Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

S

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

Snippets Groups Projects

e3d2268a

Commit e3d2268a authored 14 years ago by Francois Bleibel

Downloads
- Plain Diff

Merge branch 'master' of git+ssh://softs.laas.fr/git/jrl/sot/sot-dynamic

Conflicts:
	src/CMakeLists.txt

parents c7cbc8f2 c137c868

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

CMakeLists.txt 4 additions, 0 deletions

CMakeLists.txt
include/sot-dynamic/dynamic-hrp2.h 1 addition, 1 deletion

include/sot-dynamic/dynamic-hrp2.h
include/sot-dynamic/waist-attitude-from-sensor.h 1 addition, 1 deletion

include/sot-dynamic/waist-attitude-from-sensor.h
src/CMakeLists.txt 12 additions, 2 deletions

src/CMakeLists.txt
src/dynamic.cpp 2 additions, 2 deletions

src/dynamic.cpp

with 20 additions and 6 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