search

robotology-legacy / mex-wholebodymodel

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

Update repo #78

Closed gabrielenava closed 7 years ago

gabrielenava commented 7 years ago

I think it is time to merge the WBM-class into master. But before doing this, it is necessary to verify the controllers are still working properly, and that's why I want to first merge this branch into WBM-class.

gabrielenava commented 7 years ago

@Ganimed do you agree with this merge? I worked mostly at the high level (matlab functions) so nothing is changed in your code

Ganimed commented 7 years ago

Try it, then we will see. Or better make a copy of the WBM-Class branch and merge it there.

gabrielenava commented 7 years ago

@ganimed if you prefer, I can merge updateRepo into master instead of your branch, considering that when I resolved the conficts I merged your commits into my branch so it is currently the most updated branch of the repo

gabrielenava commented 7 years ago

updateRepo will be merged into master so no need for this pull request anymore