Skip to content
Snippets Groups Projects

Fix bugs in ArMem and make disk loading and storing nicer

Merged Rainer Kartmann requested to merge armem/fixes into armem/dev
Compare changes
  • Side-by-side
  • Inline
Files
65
  • # Conflicts:
    #	source/RobotAPI/libraries/armem/CMakeLists.txt
    #	source/RobotAPI/libraries/armem/core/base/MemoryBase.h
    #	source/RobotAPI/libraries/armem/core/longtermmemory/Entity.cpp
    #	source/RobotAPI/libraries/armem/core/longtermmemory/Entity.h
    #	source/RobotAPI/libraries/armem/core/longtermmemory/Memory.cpp
    #	source/RobotAPI/libraries/armem/server/ComponentPlugin.cpp
    #	source/RobotAPI/libraries/armem_gui/MemoryViewer.cpp
Loading