tests/TestHerdt2010.cpp · c6404e44a49e336691baf998d2eeabac4e151c4d · Guilhem Saurel / jrl-walkgen

Forked from Stack Of Tasks / jrl-walkgen

10 years ago

Merge branch 'tmp' into topic/footTrajectory · 17189cf2

Huynh Duc authored 10 years ago

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

17189cf2

History

Merge branch 'tmp' into topic/footTrajectory

Huynh Duc authored 10 years ago

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