Skip to content
Snippets Groups Projects
Commit 17189cf2 authored by Huynh Duc's avatar Huynh Duc
Browse files

Merge branch 'tmp' into topic/footTrajectory 

Conflicts:
	src/FootTrajectoryGeneration/FootTrajectoryGenerationAbstract.cpp
	src/FootTrajectoryGeneration/FootTrajectoryGenerationAbstract.hh
	src/FootTrajectoryGeneration/FootTrajectoryGenerationStandard.cpp
	src/FootTrajectoryGeneration/OnLineFootTrajectoryGeneration.cpp
	src/Mathematics/Bsplines.cpp
	src/Mathematics/Bsplines.hh
	src/PatternGeneratorInterfacePrivate.cpp
	src/StepStackHandler.cpp
	src/ZMPRefTrajectoryGeneration/ZMPDiscretization.cpp
	src/patterngeneratorinterfaceprivate.hh
	tests/TestBsplines.cpp
	tests/TestHerdt2010.cpp
parents 1beb87b6 eb2fa513
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1070 additions and 496 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