Skip to content
Snippets Groups Projects
Commit beaf5048 authored by Rohan Budhiraja's avatar Rohan Budhiraja
Browse files

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

Conflicts:
	src/ZMPRefTrajectoryGeneration/ZMPVelocityReferencedSQP.cpp
	src/ZMPRefTrajectoryGeneration/nmpc_generator.cpp
	src/ZMPRefTrajectoryGeneration/nmpc_generator.hh
	tests/CMakeLists.txt
	tests/TestNaveau2015.cpp
parents f7b98963 af9b9405
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1108 additions and 534 deletions
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