Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

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

Snippets Groups Projects

34427e1a

There was a problem fetching the pipeline summary.

Commit 34427e1a authored 8 years ago by Mirko Wächter

Downloads
- Plain Diff

Merge branch 'timeserver' into 'master'

ClockWidget features & fixes

See merge request !31

parents e88820d1 d3b7cc73

No related branches found

No related tags found

Loading

Pipeline #

Changes 3
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

source/ArmarXGui/gui-plugins/ClockPlugin/ClockWidget.ui 60 additions, 28 deletions

source/ArmarXGui/gui-plugins/ClockPlugin/ClockWidget.ui
source/ArmarXGui/gui-plugins/ClockPlugin/ClockWidgetController.cpp 64 additions, 7 deletions

...marXGui/gui-plugins/ClockPlugin/ClockWidgetController.cpp
source/ArmarXGui/gui-plugins/ClockPlugin/ClockWidgetController.h 9 additions, 1 deletion

...ArmarXGui/gui-plugins/ClockPlugin/ClockWidgetController.h

with 133 additions and 36 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