merge conflict
Merge remote branch 'origin-ipa320/master' into automerge
Merge remote branch 'origin-ipa320/master' into automerge
changed script server to followjointtrajectory action
Merge remote branch 'origin-ipa320/master' into automerge
changed follow joint trajectory name
Merge remote branch 'origin-ipa320/master' into automerge
Merge remote branch 'origin-ipa320/master' into automerge
Merge remote branch 'origin-ipa320/master' into automerge
TEST: added planning_scene_diff to MoveArmGoal for considering collision_objects during move_constrained_planned
Merge branch 'review-ipa320'
Merge branch 'master' of https://github.com/abubeck/cob_command_tools into review-abubeck
Merge remote branch 'origin-ipa320/master' into automerge
Merge remote branch 'origin-ipa320/master' into automerge
Merge branch 'review-ipa320'
Merge remote-tracking branch 'origin-ipa320/master' into automerge
more output for move_planned_constraint
Merge remote branch 'origin-ipa320/master' into automerge
Merge remote branch 'origin-ipa320/master' into automerge
fix typo