Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

b919149b

Commit b919149b authored 8 years ago by Mirko Wächter

Downloads
- Plain Diff

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

parents fae5b5cc 0e2bf9be

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/components/ViewSelection/ViewSelection.cpp 34 additions, 29 deletions

source/RobotAPI/components/ViewSelection/ViewSelection.cpp
source/RobotAPI/components/ViewSelection/ViewSelection.h 2 additions, 0 deletions

source/RobotAPI/components/ViewSelection/ViewSelection.h
source/RobotAPI/components/units/ForceTorqueUnitSimulation.cpp 1 addition, 1 deletion

...e/RobotAPI/components/units/ForceTorqueUnitSimulation.cpp
source/RobotAPI/components/units/KinematicUnitSimulation.cpp 6 additions, 6 deletions

source/RobotAPI/components/units/KinematicUnitSimulation.cpp
source/RobotAPI/components/units/PlatformUnitSimulation.cpp 3 additions, 3 deletions

source/RobotAPI/components/units/PlatformUnitSimulation.cpp
source/RobotAPI/components/units/TCPControlUnit.cpp 3 additions, 19 deletions

source/RobotAPI/components/units/TCPControlUnit.cpp
source/RobotAPI/components/units/TCPControlUnit.h 0 additions, 3 deletions

source/RobotAPI/components/units/TCPControlUnit.h

with 49 additions and 61 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