Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

RobotAPI
- Activity
- Members
- Labels
- Terraform modules

Snippets Groups Projects

7cca2b6b

Commit 7cca2b6b authored 5 years ago by Raphael Grimm

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/arches_paper_2020'

parents 49a59668 714ed701

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointCartesianWaypointController.cpp 3 additions, 3 deletions

...t/NJointControllers/NJointCartesianWaypointController.cpp
source/RobotAPI/gui-plugins/CartesianWaypointControlGui/CartesianWaypointControlGuiWidget.ui 45 additions, 34 deletions

...anWaypointControlGui/CartesianWaypointControlGuiWidget.ui
source/RobotAPI/gui-plugins/CartesianWaypointControlGui/CartesianWaypointControlGuiWidgetController.cpp 3 additions, 0 deletions

...ontrolGui/CartesianWaypointControlGuiWidgetController.cpp

with 51 additions and 37 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