Merge branch 'devel' of github.com:proyan/jrl-walkgen into devel
* [c++][src/pinocchiorobot.cpp] body and BODY both are acceptable joint names * add .version file Conflicts: src/ZMPRefTrajectoryGeneration/nmpc_generator.cpp src/ZMPRefTrajectoryGeneration/nmpc_generator.hh tests/CMakeLists.txt tests/TestNaveau2015.cpp
Loading
Please register or sign in to comment