# Conflicts:
#	source/RobotAPI/libraries/armem_robot_mapping/MappingDataReader.cpp
#	source/RobotAPI/libraries/aron/core/CMakeLists.txt

# Conflicts:
#	source/RobotAPI/libraries/armem_robot_mapping/MappingDataReader.cpp
#	source/RobotAPI/libraries/aron/core/CMakeLists.txt

Merge branch 'feature/diskMemory' of https://gitlab.com/ArmarX/RobotAPI into armem/robotstatememory_updates

# Conflicts:
#	source/RobotAPI/libraries/armem_robot_mapping/MappingDataReader.cpp
#	source/RobotAPI/libraries/aron/core/CMakeLists.txt

renamed stuff, added namespaces to base classes, shortened namespaces of memories, fixed robotsensormemory memory name

Armem/dev

See merge request ArmarX/RobotAPI!137

# Conflicts:
#	source/RobotAPI/libraries/aron/core/CMakeLists.txt

WOrking Memory updates, new namespaces for wm and ltm, updated scenarios, adapted all dependent code. First compiling version

Handle c++ style AronIncludes

See merge request ArmarX/RobotAPI!134

# Conflicts:
#	source/RobotAPI/libraries/aron/core/navigator/data/NavigatorFactory.cpp
#	source/RobotAPI/libraries/aron/core/navigator/data/complex/NDArray.cpp
#	source/RobotAPI/libraries/aron/core/navigator/data/container/Dict.cpp
#	source/RobotAPI/libraries/aron/core/navigator/data/container/List.cpp
#	source/RobotAPI/libraries/aron/core/navigator/type/NavigatorFactory.cpp