Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

0231bec3

Commit 0231bec3 authored 10 months ago by Christoph Pohl

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into feature/improve-armar7-platform-movement

parents ad68bd49 bad9c1a1

No related branches found

No related tags found

1 merge request!451Improve armar7 platform movement

Pipeline #19181 passed 10 months ago

Stage: build-and-test

Changes 4
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/libraries/aron/core/aron_conversions.h 6 additions, 0 deletions

source/RobotAPI/libraries/aron/core/aron_conversions.h
source/RobotAPI/libraries/skills_gui/skill_details/SkillDetailsGroupBox.cpp 5 additions, 2 deletions

...braries/skills_gui/skill_details/SkillDetailsGroupBox.cpp
source/RobotAPI/libraries/skills_gui/skill_details/SkillDetailsGroupBox.h 2 additions, 0 deletions

...libraries/skills_gui/skill_details/SkillDetailsGroupBox.h
source/RobotAPI/libraries/skills_gui/skills/SkillGroupBox.cpp 1 addition, 0 deletions

...ce/RobotAPI/libraries/skills_gui/skills/SkillGroupBox.cpp

with 14 additions and 2 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