Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

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

Snippets Groups Projects

2f27fbb6

Commit 2f27fbb6 authored 2 years ago by Christian Dreher

Downloads
- Plain Diff

Merge branch 'feature/axg_wm_class' into 'master'

Feature/axg wm class

See merge request !83

parents b0a452b0 a45f66b7

No related branches found

No related tags found

1 merge request!83Feature/axg wm class

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

data/ArmarXGui/armarx_logo.svg 4 additions, 0 deletions

data/ArmarXGui/armarx_logo.svg
source/ArmarXGui/applications/ArmarXGui/ArmarXGuiApp.cpp 13 additions, 5 deletions

source/ArmarXGui/applications/ArmarXGui/ArmarXGuiApp.cpp
source/ArmarXGui/applications/ArmarXGui/ArmarXMainWindow.cpp 2 additions, 2 deletions

source/ArmarXGui/applications/ArmarXGui/ArmarXMainWindow.cpp
source/ArmarXGui/applications/ArmarXGui/main.cpp 1 addition, 3 deletions

source/ArmarXGui/applications/ArmarXGui/main.cpp

with 20 additions and 10 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