search

robotology-legacy / mex-wholebodymodel

Matlab MEX interface to the iWholeBodyModel interface.
11 stars 9 forks source link

Merging WBM-Class into WBM-Controllers #83

Closed gabrielenava closed 7 years ago

gabrielenava commented 7 years ago

in order to update controllers branch with last modifications.

gabrielenava commented 7 years ago

This conflicts are my fault, I renamed mex-wholebodmodel folder into wbm-toolbox. The reason is I continuously opened that folder by mistake because the name was more or less the same of repo's name. I will deal with this conflicts, or eventually we can open the pull request for WBM-Class w.r.t. master directly