Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

06dc5ad9

Commit 06dc5ad9 authored 1 year ago by Peter Albrecht

Downloads
- Plain Diff

Merge branch 'master' into feature/skillMemoryGUI

parents acf14dbd 1d1ba090

No related branches found

No related tags found

Loading

Checking pipeline status

Changes 6
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/libraries/aron/common/aron/framed.xml 9 additions, 0 deletions

source/RobotAPI/libraries/aron/common/aron/framed.xml
source/RobotAPI/libraries/aron/common/aron_conversions/framed.cpp 20 additions, 0 deletions

...obotAPI/libraries/aron/common/aron_conversions/framed.cpp
source/RobotAPI/libraries/aron/common/aron_conversions/framed.h 4 additions, 0 deletions

.../RobotAPI/libraries/aron/common/aron_conversions/framed.h
source/RobotAPI/libraries/skills/provider/CMakeLists.txt 5 additions, 0 deletions

source/RobotAPI/libraries/skills/provider/CMakeLists.txt
source/RobotAPI/libraries/skills/provider/mixins/RobotReadingSkillMixin.cpp 21 additions, 0 deletions

...braries/skills/provider/mixins/RobotReadingSkillMixin.cpp
source/RobotAPI/libraries/skills/provider/mixins/RobotReadingSkillMixin.h 3 additions, 7 deletions

...libraries/skills/provider/mixins/RobotReadingSkillMixin.h

with 62 additions and 7 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