search

squirrel-project / squirrel_planning

Repository for planning related SQUIRREL packages.
0 stars 8 forks source link

merge with robot version #23

Closed ipa-nhg closed 9 years ago

m312z commented 9 years ago

Hello, these changes seem to revert to an earlier version, in which we used the" simulate"parameter multiple times. Additionally there are some strange merge lines.

I don't see any new changes.

m312z commented 9 years ago

Please make the pull request to my fork instead, so I can merge into my working version.

ipa-nhg commented 9 years ago

Hi Michael, it is the robotino's version after the integration week, I though also that it was out-of-date . But I think that we need still the changes on: squirrel_interface_hri/src/RPPointingServer.cpp

ipa-nhg commented 9 years ago

https://github.com/m312z/squirrel_planning/pull/14 opened a new pull request.

I will close this one