Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

51eafa6e

Commit 51eafa6e authored 10 months ago by Julian Tusch

:no_entry_sign:

Downloads
- Plain Diff

Merge branch 'fluxio/dev' into fluxio/dev-pointer-shenanigans

parents 7d9ed3d1 497395da

2 merge requests!459fluxio/dev Pointer Shenanigans,!449Fluxio preliminary release

Pipeline #19504 passed 10 months ago

Stage: build-and-test

Changes 8
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/interface/skills/SkillManagerInterface.ice 11 additions, 10 deletions

source/RobotAPI/interface/skills/SkillManagerInterface.ice
source/RobotAPI/libraries/skills/core/FluxioSkill.cpp 37 additions, 4 deletions

source/RobotAPI/libraries/skills/core/FluxioSkill.cpp
source/RobotAPI/libraries/skills/core/FluxioSkill.h 2 additions, 1 deletion

source/RobotAPI/libraries/skills/core/FluxioSkill.h
source/RobotAPI/libraries/skills/core/executor/FluxioCompositeExecutor.cpp 7 additions, 0 deletions

...ibraries/skills/core/executor/FluxioCompositeExecutor.cpp
source/RobotAPI/libraries/skills/manager/SkillManagerComponentPlugin.cpp 107 additions, 3 deletions

.../libraries/skills/manager/SkillManagerComponentPlugin.cpp
source/RobotAPI/libraries/skills/manager/SkillManagerComponentPlugin.h 2 additions, 1 deletion

...PI/libraries/skills/manager/SkillManagerComponentPlugin.h
source/RobotAPI/libraries/skills/manager/SkillManagerComponentPluginUser.cpp 20 additions, 3 deletions

...raries/skills/manager/SkillManagerComponentPluginUser.cpp
source/RobotAPI/libraries/skills/manager/SkillManagerComponentPluginUser.h 10 additions, 5 deletions

...ibraries/skills/manager/SkillManagerComponentPluginUser.h

with 196 additions and 27 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