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

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
parents c0c95dc8 a7f73bf8
No related branches found
No related tags found
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment