Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

RobotAPI
- Activity
- Members
- Labels
- Container Registry
- Model registry

Snippets Groups Projects

962e4f75

Commit 962e4f75 authored 4 years ago by Fabian Paus

Downloads
- Plain Diff

Merge branch 'master' of gitlab.com:ArmarX/RobotAPI

parents 3ad0f45f 6ca88c71

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

data/RobotAPI/VariantInfo-RobotAPI.xml 9 additions, 7 deletions

data/RobotAPI/VariantInfo-RobotAPI.xml
source/RobotAPI/components/DSObstacleAvoidance/DSObstacleAvoidance.cpp 11 additions, 6 deletions

...PI/components/DSObstacleAvoidance/DSObstacleAvoidance.cpp
source/RobotAPI/components/DynamicObstacleManager/DynamicObstacleManager.cpp 9 additions, 4 deletions

...ponents/DynamicObstacleManager/DynamicObstacleManager.cpp
source/RobotAPI/interface/components/ObstacleAvoidance/DSObstacleAvoidanceInterface.ice 1 addition, 2 deletions

...onents/ObstacleAvoidance/DSObstacleAvoidanceInterface.ice

with 30 additions and 19 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment