Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

2ada7b51

Commit 2ada7b51 authored 1 year ago by Julian Tusch

:no_entry_sign:

Downloads
- Plain Diff

Merge branch 'master' into fluxio/dev-control-token-special-nodes

parents 70c55912 6a648856

No related branches found

No related tags found

3 merge requests!460Draft: fluxio/dev-skill-timeout,!456Fluxio/dev control token special nodes,!449Fluxio preliminary release

Pipeline #18997 passed 1 year ago

Stage: build-and-test

Changes 4
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/components/units/RobotUnit/RobotUnitModules/RobotUnitModuleControllerManagement.cpp 0 additions, 26 deletions

.../RobotUnitModules/RobotUnitModuleControllerManagement.cpp
source/RobotAPI/components/units/RobotUnit/RobotUnitModules/RobotUnitModuleControllerManagement.h 1 addition, 18 deletions

...it/RobotUnitModules/RobotUnitModuleControllerManagement.h
source/RobotAPI/gui-plugins/RobotUnitPlugin/QWidgets/NJointControllerClassesWidget.cpp 42 additions, 39 deletions

...obotUnitPlugin/QWidgets/NJointControllerClassesWidget.cpp
source/RobotAPI/interface/units/RobotUnit/RobotUnitInterface.ice 0 additions, 6 deletions

...RobotAPI/interface/units/RobotUnit/RobotUnitInterface.ice

with 43 additions and 89 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