Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

d50c8157

Commit d50c8157 authored 4 years ago by Rainer Kartmann

Downloads
- Plain Diff

Merge branch 'aron/aron-includes' into 'armem/dev'

Handle c++ style AronIncludes

See merge request ArmarX/RobotAPI!134

parents 4f47a3d4 ad86c496

No related branches found

No related tags found

2 merge requests!137Armem/dev,!134Handle c++ style AronIncludes

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/libraries/aron/core/codegenerator/typeReader/xml/Reader.cpp 48 additions, 4 deletions

...braries/aron/core/codegenerator/typeReader/xml/Reader.cpp
source/RobotAPI/libraries/aron/core/codegenerator/typeReader/xml/Reader.h 9 additions, 1 deletion

...libraries/aron/core/codegenerator/typeReader/xml/Reader.h
source/RobotAPI/libraries/aron/core/test/CMakeLists.txt 10 additions, 8 deletions

source/RobotAPI/libraries/aron/core/test/CMakeLists.txt

with 67 additions and 13 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