Skip to content
Snippets Groups Projects
Commit 283045b5 authored by mnaveau's avatar mnaveau
Browse files

Merge branch 'master' into topic/SQP_5ms_pinocchio and try to debug the zmp...

Merge branch 'master' into topic/SQP_5ms_pinocchio and try to debug the zmp computation in the pinocchio robot

Conflicts:
	.travis
	src/ZMPRefTrajectoryGeneration/DynamicFilter.cpp
	src/ZMPRefTrajectoryGeneration/ZMPVelocityReferencedSQP.cpp
	src/ZMPRefTrajectoryGeneration/ZMPVelocityReferencedSQP.hh
	src/ZMPRefTrajectoryGeneration/nmpc_generator.cpp
	tests/CMakeLists.txt
	tests/TestNaveau2015.cpp
parents 3dd853a9 fbe83d87
No related branches found
No related tags found
No related merge requests found
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 to comment