Skip to content
Snippets Groups Projects
Commit 193ec40e authored by mnaveau's avatar mnaveau
Browse files

Merge branch 'devel' of github.com:jrl-umi3218/jrl-walkgen into devel 

Conflicts:
	src/ZMPRefTrajectoryGeneration/ZMPVelocityReferencedSQP.cpp
	src/ZMPRefTrajectoryGeneration/nmpc_generator.cpp
	src/ZMPRefTrajectoryGeneration/nmpc_generator.hh
	tests/CMakeLists.txt
	tests/TestNaveau2015.cpp
parents b5626c5c fe82f974
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment