Skip to content
Snippets Groups Projects
Commit 4be2915d authored by mnaveau's avatar mnaveau
Browse files

Merge remote-tracking branch 'trac/topic/SQP_5ms' into topic/SQP_5ms 

Conflicts:
	src/ZMPRefTrajectoryGeneration/nmpc_generator.cpp
	tests/TestNaveau2015.cpp
parents bb6d1191 a92cc44e
No related branches found
Tags v2.2.0
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