Skip to content
Snippets Groups Projects
Commit a217343e authored by Nicolas Mansard's avatar Nicolas Mansard
Browse files

Merge branch 'topic/python' of github.com:jrl-umi3218/sot-dynamic into topic/python

Conflicts:
	include/sot-dynamic/dynamic.h
parents fdc38afb 029a4d08
No related branches found
No related tags found
1 merge request!1[major][cpp] starting point to integrate pinocchio
......@@ -67,6 +67,10 @@ class DYNAMICHRP2_10_EXPORT DynamicHrp2_10
DynamicHrp2_10( const std::string& name );
virtual ~DynamicHrp2_10( void );
virtual const std::string& getClassName () const
{
return CLASS_NAME;
}
public: /* --- MODEL CREATION --- */
......
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