Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

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

Snippets Groups Projects

eff02153

Commit eff02153 authored 8 months ago by Christian Dreher

Downloads
- Plain Diff

Merge branch 'fix/emergency_stop_button' into 'master'

Fix rogue emergency stop button

See merge request !99

parents b48f55fc b316a338

No related branches found

No related tags found

Loading

Checking pipeline status

Changes 3
Pipelines 3

Hide whitespace changes

Inline Side-by-side

Showing

source/ArmarXGui/applications/ArmarXGui/CMakeLists.txt 9 additions, 0 deletions

source/ArmarXGui/applications/ArmarXGui/CMakeLists.txt
source/ArmarXGui/applications/ArmarXGui/Widgets/EmergencyStopWidget.cpp 173 additions, 47 deletions

...ui/applications/ArmarXGui/Widgets/EmergencyStopWidget.cpp
source/ArmarXGui/applications/ArmarXGui/Widgets/EmergencyStopWidget.h 27 additions, 16 deletions

...XGui/applications/ArmarXGui/Widgets/EmergencyStopWidget.h

with 209 additions and 63 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