Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

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

Snippets Groups Projects

1ce422c0

Commit 1ce422c0 authored 8 years ago by Mirko Wächter

Downloads
- Plain Diff

Merge branch 'master' of https://gitlab.com/ArmarX/ArmarXGui

parents f26cca98 ab58eeb2

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

data/ArmarXGui/GuiDefaultConfigs/Statecharts.armarxgui 3 additions, 3 deletions

data/ArmarXGui/GuiDefaultConfigs/Statecharts.armarxgui
etc/cmake/ArmarXPackageVersion.cmake 1 addition, 1 deletion

etc/cmake/ArmarXPackageVersion.cmake
source/ArmarXGui/applications/ArmarXGui/ArmarXMainWindow.cpp 1 addition, 140 deletions

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

source/ArmarXGui/applications/ArmarXGui/ArmarXMainWindow.h

with 5 additions and 150 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