# Conflicts:
#	source/RobotAPI/libraries/ArmarXEtherCAT/EtherCAT.cpp
#	source/RobotAPI/libraries/ArmarXEtherCAT/EtherCAT.h
#	source/RobotAPI/libraries/ArmarXEtherCAT/EtherCATRTUnit.cpp
#	source/RobotAPI/libraries/ArmarXEtherCAT/EtherCATRTUnit.h
#	source/RobotAPI/libraries/DMPController/TaskSpaceDMPController.h
#	source/RobotAPI/libraries/RobotAPINJointControllers/CMakeLists.txt
#	source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointTaskSpaceImpedanceDMPController.cpp

# Conflicts:
#	data/RobotAPI/VariantInfo-RobotAPI.xml
#	source/RobotAPI/components/CMakeLists.txt
#	source/RobotAPI/libraries/RobotAPINJointControllers/CMakeLists.txt

# Conflicts:
#	data/RobotAPI/VariantInfo-RobotAPI.xml
#	source/RobotAPI/components/CMakeLists.txt
#	source/RobotAPI/libraries/RobotAPINJointControllers/BimanualForceControllers/NJointBimanualObjLevelController.cpp
#	source/RobotAPI/libraries/RobotAPINJointControllers/CMakeLists.txt

# Conflicts:
#	data/RobotAPI/VariantInfo-RobotAPI.xml
#	source/RobotAPI/components/CMakeLists.txt
#	source/RobotAPI/libraries/RobotAPINJointControllers/BimanualForceControllers/NJointBimanualObjLevelController.cpp
#	source/RobotAPI/libraries/RobotAPINJointControllers/CMakeLists.txt

- Use axisLengths instead.

(not necessary for demo)

Allow creating an ArViz client from topic, add variant info declarations for ArViz to use in statecharts.

Add DebugDrawerToArViz

See merge request ArmarX/RobotAPI!69