Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

RobotAPI
- Activity
- Members
- Labels
- Terraform modules

Snippets Groups Projects

00f1d3e5

Commit 00f1d3e5 authored 4 years ago by ArmarX User

Downloads
- Patches
- Plain Diff

fix merge error

parent 318df006

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/components/units/RobotUnit/Units/KinematicSubUnit.cpp 0 additions, 2 deletions

...API/components/units/RobotUnit/Units/KinematicSubUnit.cpp
source/RobotAPI/libraries/ArmarXEtherCAT/EtherCATRTUnit.cpp 0 additions, 33 deletions

source/RobotAPI/libraries/ArmarXEtherCAT/EtherCATRTUnit.cpp
source/RobotAPI/libraries/DMPController/TaskSpaceDMPController.cpp 6 additions, 7 deletions

...botAPI/libraries/DMPController/TaskSpaceDMPController.cpp
source/RobotAPI/libraries/RobotAPINJointControllers/CMakeLists.txt 2 additions, 0 deletions

...botAPI/libraries/RobotAPINJointControllers/CMakeLists.txt
source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointTSDMPController.h 5 additions, 5 deletions

...PINJointControllers/DMPController/NJointTSDMPController.h

with 13 additions and 47 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