# Conflicts:
#	source/RobotAPI/libraries/armem/core/diskmemory/CoreSegment.cpp

ArViz: Replace Coin timer by QtTimer to fix ArViz from freezing...

See merge request ArmarX/RobotAPI!183

(FP, RK) ArViz: Replace Coin timer by QtTimer to fix ArViz from freezing (update() would not be called in some cases)

positive

- Use emplace(key, value)
- Do not use std::map directly for the getters

fix skill observer missing include. Fix RobotStateMemory SegFault if aron in memory is null or not a dict (actually this should never happen. Dont know why this is happening here...)

aron forward declarations

See merge request ArmarX/RobotAPI!180