Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

RobotAPI
- Activity
- Members
- Labels
- Terraform modules

Snippets Groups Projects

0c976532

Commit 0c976532 authored 8 years ago by armar4-demo

Downloads
- Plain Diff

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

parents 7387b973 7a3145e2

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

etc/cmake/ArmarXPackageVersion.cmake 1 addition, 1 deletion

etc/cmake/ArmarXPackageVersion.cmake
source/RobotAPI/gui-plugins/RobotViewerPlugin/CMakeLists.txt 8 additions, 8 deletions

source/RobotAPI/gui-plugins/RobotViewerPlugin/CMakeLists.txt
source/RobotAPI/gui-plugins/RobotViewerPlugin/RobotViewerConfigDialog.cpp 0 additions, 89 deletions

...gui-plugins/RobotViewerPlugin/RobotViewerConfigDialog.cpp
source/RobotAPI/gui-plugins/RobotViewerPlugin/RobotViewerConfigDialog.h 0 additions, 74 deletions

...I/gui-plugins/RobotViewerPlugin/RobotViewerConfigDialog.h
source/RobotAPI/gui-plugins/RobotViewerPlugin/RobotViewerConfigDialog.ui 0 additions, 63 deletions

.../gui-plugins/RobotViewerPlugin/RobotViewerConfigDialog.ui
source/RobotAPI/gui-plugins/RobotViewerPlugin/RobotViewerGuiPlugin.cpp 219 additions, 22 deletions

...PI/gui-plugins/RobotViewerPlugin/RobotViewerGuiPlugin.cpp
source/RobotAPI/gui-plugins/RobotViewerPlugin/RobotViewerGuiPlugin.h 15 additions, 7 deletions

...tAPI/gui-plugins/RobotViewerPlugin/RobotViewerGuiPlugin.h
source/RobotAPI/gui-plugins/RobotViewerPlugin/RobotViewerGuiPlugin.ui 122 additions, 61 deletions

...API/gui-plugins/RobotViewerPlugin/RobotViewerGuiPlugin.ui

with 365 additions and 325 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