Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

RobotAPI
- Activity
- Members
- Labels
- Terraform modules

Snippets Groups Projects

1a1f78e6

Commit 1a1f78e6 authored 8 years ago by zhou

Downloads
- Plain Diff

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

parents 2cb0e06d a82d7207

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/gui-plugins/CMakeLists.txt 1 addition, 1 deletion

source/RobotAPI/gui-plugins/CMakeLists.txt
source/RobotAPI/gui-plugins/SensorActorWidgetsPlugin/ArmarXPlotter/ArmarXPlotter.h 1 addition, 1 deletion

...ns/SensorActorWidgetsPlugin/ArmarXPlotter/ArmarXPlotter.h
source/RobotAPI/libraries/core/Trajectory.cpp 12 additions, 11 deletions

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

source/RobotAPI/libraries/core/Trajectory.h

with 17 additions and 16 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