Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

806a6049

Commit 806a6049 authored 7 years ago by Raphael Grimm

Downloads
- Plain Diff

Merge branch 'RobotUnit_v3' of https://gitlab.com/ArmarX/RobotAPI into RobotUnit_v3

parents 4b28d704 f63f7261

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/gui-plugins/RobotUnitPlugin/QWidgets/ControlDevicesWidget.cpp 8 additions, 4 deletions

...plugins/RobotUnitPlugin/QWidgets/ControlDevicesWidget.cpp
source/RobotAPI/gui-plugins/RobotUnitPlugin/QWidgets/NJointControllerClassesWidget.cpp 3 additions, 3 deletions

...obotUnitPlugin/QWidgets/NJointControllerClassesWidget.cpp
source/RobotAPI/gui-plugins/RobotUnitPlugin/QWidgets/NJointControllersWidget.cpp 9 additions, 5 deletions

...gins/RobotUnitPlugin/QWidgets/NJointControllersWidget.cpp
source/RobotAPI/gui-plugins/RobotUnitPlugin/QWidgets/RobotUnitWidgetBase.cpp 3 additions, 3 deletions

...-plugins/RobotUnitPlugin/QWidgets/RobotUnitWidgetBase.cpp
source/RobotAPI/gui-plugins/RobotUnitPlugin/QWidgets/RobotUnitWidgetBase.h 1 addition, 1 deletion

...ui-plugins/RobotUnitPlugin/QWidgets/RobotUnitWidgetBase.h
source/RobotAPI/gui-plugins/RobotUnitPlugin/QWidgets/SensorDevicesWidget.cpp 7 additions, 3 deletions

...-plugins/RobotUnitPlugin/QWidgets/SensorDevicesWidget.cpp

with 31 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