Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

1aa4cbb0

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

Downloads
- Plain Diff

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

parents 00f76f04 934f85ed

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 3 additions, 0 deletions

.gitignore
source/RobotAPI/components/units/HandUnit.cpp 1 addition, 1 deletion

source/RobotAPI/components/units/HandUnit.cpp
source/RobotAPI/gui-plugins/HandUnitPlugin/HandUnitGuiPlugin.cpp 18 additions, 18 deletions

...RobotAPI/gui-plugins/HandUnitPlugin/HandUnitGuiPlugin.cpp
source/RobotAPI/gui-plugins/KinematicUnitPlugin/KinematicUnitGuiPlugin.cpp 18 additions, 17 deletions

...ui-plugins/KinematicUnitPlugin/KinematicUnitGuiPlugin.cpp
source/RobotAPI/gui-plugins/KinematicUnitPlugin/kinematicunitguiplugin.ui 28 additions, 21 deletions

...gui-plugins/KinematicUnitPlugin/kinematicunitguiplugin.ui
source/RobotAPI/libraries/core/PIDController.h 1 addition, 1 deletion

source/RobotAPI/libraries/core/PIDController.h
source/RobotAPI/libraries/core/Trajectory.cpp 6 additions, 6 deletions

source/RobotAPI/libraries/core/Trajectory.cpp
source/RobotAPI/libraries/core/Trajectory.h 46 additions, 2 deletions

source/RobotAPI/libraries/core/Trajectory.h

with 121 additions and 66 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