Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

RobotAPI
- Activity
- Members
- Labels
- Terraform modules

Snippets Groups Projects

37790297

Commit 37790297 authored 5 years ago by Rainer Kartmann

Downloads
- Plain Diff

Merge branch 'update-json-includes' into 'master'

Update includes to SimoxUtility/json

See merge request ArmarX/RobotAPI!59

parents 2031e980 2117c0ce

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/components/ArViz/ArVizStorage.cpp 1 addition, 1 deletion

source/RobotAPI/components/ArViz/ArVizStorage.cpp
source/RobotAPI/gui-plugins/CartesianWaypointControlGui/CartesianWaypointControlGuiWidgetController.cpp 2 additions, 2 deletions

...ontrolGui/CartesianWaypointControlGuiWidgetController.cpp
source/RobotAPI/gui-plugins/KinematicUnitPlugin/KinematicUnitGuiPlugin.cpp 2 additions, 2 deletions

...ui-plugins/KinematicUnitPlugin/KinematicUnitGuiPlugin.cpp
source/RobotAPI/libraries/widgets/JSONTreeModel.h 1 addition, 1 deletion

source/RobotAPI/libraries/widgets/JSONTreeModel.h

with 6 additions and 6 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