Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

afa5db32

Commit afa5db32 authored 3 years ago by Christoph Pohl

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master'

parents 17a37915 a01ea50c

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/libraries/armem_gui/instance/InstanceView.cpp 21 additions, 8 deletions

...ce/RobotAPI/libraries/armem_gui/instance/InstanceView.cpp
source/RobotAPI/libraries/armem_gui/instance/InstanceView.h 3 additions, 1 deletion

source/RobotAPI/libraries/armem_gui/instance/InstanceView.h
source/RobotAPI/libraries/armem_gui/instance/tree_builders/TypedDataTreeBuilder.cpp 3 additions, 0 deletions

...armem_gui/instance/tree_builders/TypedDataTreeBuilder.cpp
source/RobotAPI/libraries/armem_gui/instance/tree_visitors/TreeTypedJSONConverter.cpp 30 additions, 2 deletions

...mem_gui/instance/tree_visitors/TreeTypedJSONConverter.cpp
source/RobotAPI/libraries/armem_gui/instance/tree_visitors/TreeTypedJSONConverter.h 2 additions, 0 deletions

...armem_gui/instance/tree_visitors/TreeTypedJSONConverter.h
source/RobotAPI/libraries/aron/core/codegenerator/codewriter/cpp/generator/Generator.cpp 4 additions, 16 deletions

...core/codegenerator/codewriter/cpp/generator/Generator.cpp

with 63 additions and 27 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