Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

ff4c7588

There was a problem fetching the pipeline summary.

Commit ff4c7588 authored 7 years ago by Mirko Wächter

Downloads
- Plain Diff

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

parents 9c5f8b8b 759179e8

No related branches found

No related tags found

No related merge requests found

Pipeline #

Changes 4
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

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

etc/cmake/ArmarXPackageVersion.cmake
source/RobotAPI/components/units/ForceTorqueObserver.cpp 7 additions, 6 deletions

source/RobotAPI/components/units/ForceTorqueObserver.cpp
source/RobotAPI/gui-plugins/KinematicUnitPlugin/KinematicUnitGuiPlugin.cpp 11 additions, 14 deletions

...ui-plugins/KinematicUnitPlugin/KinematicUnitGuiPlugin.cpp
source/RobotAPI/gui-plugins/KinematicUnitPlugin/kinematicunitguiplugin.ui 0 additions, 13 deletions

...gui-plugins/KinematicUnitPlugin/kinematicunitguiplugin.ui

with 19 additions and 34 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