# Conflicts:
#	source/RobotAPI/libraries/aron/codegeneration/typereader/xml/Reader.cpp
#	source/RobotAPI/libraries/aron/codegeneration/typereader/xml/Reader.h

aron code generation: explicitly specifying include paths

See merge request ArmarX/RobotAPI!268

Fix/rename coin3d to coin

See merge request ArmarX/RobotAPI!267

RobotUnit with global robot pose information

See merge request ArmarX/RobotAPI!258

This reverts commit 6128ed04.

Merge branch 'feature/robot-unit-with-global-robot-pose-information' of gitlab.com:ArmarX/RobotAPI into feature/robot-unit-with-global-robot-pose-information

Merge remote-tracking branch 'origin/master' into feature/robot-unit-with-global-robot-pose-information

frames (FR)

to timestamp) (FR)

(FR)

aron read and write of dto types moved to rw part in aron common. Moved base class of aron generated classes to aron core to have the concept for aron conversions and rw templates.

# Conflicts:
#	source/RobotAPI/libraries/armem_gui/instance/InstanceView.cpp

renamed enums of aron. Splitted aron in codegeneration and core. Updates to skills framework. Fixed aron dto types and removed useless ice type.

Merge branch '105-make-object-memory-robot-state-memory-not-dependent-on-full-simulation' into 'master'

Resolve "Make object memory / robot state memory not dependent on full simulation"

Closes #105

See merge request ArmarX/RobotAPI!264