• Pierre Fernbach's avatar
    Merge branch 'sigasia' into test-merge/dynamicPlanner · 8b75af39
    Pierre Fernbach authored
    Conflicts:
    	CMakeLists.txt
    	idl/hpp/corbaserver/rbprm/rbprmbuilder.idl
    	script/scenarios/demos/stair_bauzil_hrp2_interp.py
    	src/hpp/corbaserver/rbprm/rbprmfullbody.py
    	src/hpp/corbaserver/rbprm/tools/cwc_trajectory.py
    	src/hpp/corbaserver/rbprm/tools/path_to_trajectory.py
    	src/rbprmbuilder.impl.cc
    	src/rbprmbuilder.impl.hh
    8b75af39