Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

b68d7bab

Commit b68d7bab authored 2 years ago by Fabian Tërnava

Downloads
- Plain Diff

Merge branch 'aron/dev' into fabianpk

# Conflicts:
#	source/RobotAPI/libraries/aron/converter/common/VectorConverter.h

parents 9573c5e5 c47f2540

No related branches found

No related tags found

1 merge request!337Merge fabianpk dev branch

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/libraries/aron/codegeneration/typereader/xml/Data.h 27 additions, 16 deletions

...otAPI/libraries/aron/codegeneration/typereader/xml/Data.h
source/RobotAPI/libraries/aron/codegeneration/typereader/xml/Factory.cpp 12 additions, 1 deletion

.../libraries/aron/codegeneration/typereader/xml/Factory.cpp
source/RobotAPI/libraries/aron/codegeneration/typereader/xml/Reader.cpp 4 additions, 2 deletions

...I/libraries/aron/codegeneration/typereader/xml/Reader.cpp

with 43 additions and 19 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