Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

69e5f02b

Commit 69e5f02b authored 5 years ago by Mirko Wächter

Downloads
- Plain Diff

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

parents 925cedbb b808e447

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/components/DebugDrawer/DebugDrawerComponent.cpp 1 addition, 1 deletion

.../RobotAPI/components/DebugDrawer/DebugDrawerComponent.cpp
source/RobotAPI/components/DebugDrawer/DebugDrawerComponent.h 22 additions, 0 deletions

...ce/RobotAPI/components/DebugDrawer/DebugDrawerComponent.h
source/RobotAPI/libraries/DebugDrawerConfigWidget/DebugDrawerConfigWidget.cpp 125 additions, 27 deletions

...aries/DebugDrawerConfigWidget/DebugDrawerConfigWidget.cpp
source/RobotAPI/libraries/DebugDrawerConfigWidget/DebugDrawerConfigWidget.h 12 additions, 1 deletion

...braries/DebugDrawerConfigWidget/DebugDrawerConfigWidget.h
source/RobotAPI/libraries/DebugDrawerConfigWidget/DebugDrawerConfigWidget.ui 21 additions, 0 deletions

...raries/DebugDrawerConfigWidget/DebugDrawerConfigWidget.ui

with 181 additions and 29 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