Merge branch 'master' into armem/robot-state-memory
# Conflicts: # source/RobotAPI/libraries/armem/core/diskmemory/CoreSegment.cpp
No related branches found
No related tags found
This commit is part of merge request !178. Comments created here will be created in the context of that merge request.
Showing
- source/RobotAPI/components/ArViz/Client/drawer/ArVizDrawerBase.cpp 11 additions, 5 deletions...botAPI/components/ArViz/Client/drawer/ArVizDrawerBase.cpp
- source/RobotAPI/components/ArViz/Client/drawer/ArVizDrawerBase.h 11 additions, 9 deletions...RobotAPI/components/ArViz/Client/drawer/ArVizDrawerBase.h
- source/RobotAPI/components/ArViz/Coin/Visualizer.cpp 23 additions, 11 deletionssource/RobotAPI/components/ArViz/Coin/Visualizer.cpp
- source/RobotAPI/components/ArViz/Coin/Visualizer.h 5 additions, 0 deletionssource/RobotAPI/components/ArViz/Coin/Visualizer.h
- source/RobotAPI/components/units/ObstacleAwarePlatformUnit/ObstacleAwarePlatformUnit.cpp 30 additions, 8 deletions...s/ObstacleAwarePlatformUnit/ObstacleAwarePlatformUnit.cpp
- source/RobotAPI/components/units/ObstacleAwarePlatformUnit/ObstacleAwarePlatformUnit.h 1 addition, 1 deletion...its/ObstacleAwarePlatformUnit/ObstacleAwarePlatformUnit.h
- source/RobotAPI/gui-plugins/ArViz/ArVizWidgetController.cpp 12 additions, 1 deletionsource/RobotAPI/gui-plugins/ArViz/ArVizWidgetController.cpp
- source/RobotAPI/gui-plugins/ArViz/ArVizWidgetController.h 2 additions, 0 deletionssource/RobotAPI/gui-plugins/ArViz/ArVizWidgetController.h
- source/RobotAPI/libraries/ArmarXEtherCAT/EtherCAT.cpp 3 additions, 3 deletionssource/RobotAPI/libraries/ArmarXEtherCAT/EtherCAT.cpp
- source/RobotAPI/libraries/armem/client/util/MemoryListener.cpp 5 additions, 2 deletions...e/RobotAPI/libraries/armem/client/util/MemoryListener.cpp
- source/RobotAPI/libraries/armem/core/base/CoreSegmentBase.h 4 additions, 4 deletionssource/RobotAPI/libraries/armem/core/base/CoreSegmentBase.h
- source/RobotAPI/libraries/armem/core/base/MemoryBase.h 4 additions, 4 deletionssource/RobotAPI/libraries/armem/core/base/MemoryBase.h
- source/RobotAPI/libraries/armem/core/base/ProviderSegmentBase.h 4 additions, 4 deletions.../RobotAPI/libraries/armem/core/base/ProviderSegmentBase.h
- source/RobotAPI/libraries/armem/core/diskmemory/CoreSegment.cpp 2 additions, 2 deletions.../RobotAPI/libraries/armem/core/diskmemory/CoreSegment.cpp
- source/RobotAPI/libraries/armem/core/diskmemory/Memory.cpp 2 additions, 2 deletionssource/RobotAPI/libraries/armem/core/diskmemory/Memory.cpp
- source/RobotAPI/libraries/armem/core/diskmemory/ProviderSegment.cpp 2 additions, 2 deletions...otAPI/libraries/armem/core/diskmemory/ProviderSegment.cpp
- source/RobotAPI/libraries/armem/core/longtermmemory/CoreSegment.cpp 2 additions, 2 deletions...otAPI/libraries/armem/core/longtermmemory/CoreSegment.cpp
- source/RobotAPI/libraries/armem/core/longtermmemory/Memory.cpp 2 additions, 2 deletions...e/RobotAPI/libraries/armem/core/longtermmemory/Memory.cpp
- source/RobotAPI/libraries/armem/core/longtermmemory/ProviderSegment.cpp 2 additions, 2 deletions...I/libraries/armem/core/longtermmemory/ProviderSegment.cpp
- source/RobotAPI/libraries/armem_objects/server/instance/Decay.cpp 9 additions, 10 deletions...obotAPI/libraries/armem_objects/server/instance/Decay.cpp
Loading
Please register or sign in to comment