Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

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

Snippets Groups Projects

000638b9

There was a problem fetching the pipeline summary.

Commit 000638b9 authored 8 years ago by Mirko Wächter

Downloads
- Plain Diff

Merge branch 'EmergencyStop' into 'master'

Emergency stop

See merge request !40

parents fec82edd 6500d8c6

No related branches found

No related tags found

Loading

Pipeline #

Changes 8
Pipelines 2

Hide whitespace changes

Inline Side-by-side

Showing

source/ArmarXGui/applications/ArmarXGui/ArmarXMainWindow.cpp 21 additions, 9 deletions

source/ArmarXGui/applications/ArmarXGui/ArmarXMainWindow.cpp
source/ArmarXGui/applications/ArmarXGui/ArmarXMainWindow.h 7 additions, 0 deletions

source/ArmarXGui/applications/ArmarXGui/ArmarXMainWindow.h
source/ArmarXGui/applications/ArmarXGui/CMakeLists.txt 2 additions, 0 deletions

source/ArmarXGui/applications/ArmarXGui/CMakeLists.txt
source/ArmarXGui/applications/ArmarXGui/Widgets/EmergencyStopWidget.cpp 130 additions, 0 deletions

...ui/applications/ArmarXGui/Widgets/EmergencyStopWidget.cpp
source/ArmarXGui/applications/ArmarXGui/Widgets/EmergencyStopWidget.h 97 additions, 0 deletions

...XGui/applications/ArmarXGui/Widgets/EmergencyStopWidget.h
source/ArmarXGui/libraries/ArmarXGuiBase/armarxicons.qrc 2 additions, 0 deletions

source/ArmarXGui/libraries/ArmarXGuiBase/armarxicons.qrc
source/ArmarXGui/libraries/ArmarXGuiBase/icons/emergency-stop-dark.png 0 additions, 0 deletions

...Gui/libraries/ArmarXGuiBase/icons/emergency-stop-dark.png
source/ArmarXGui/libraries/ArmarXGuiBase/icons/emergency-stop.png 0 additions, 0 deletions

...rmarXGui/libraries/ArmarXGuiBase/icons/emergency-stop.png

with 259 additions and 9 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