# Conflicts:
#	source/RobotAPI/libraries/armem/server/ltm/CoreSegment.cpp
#	source/RobotAPI/libraries/armem/server/ltm/Entity.cpp
#	source/RobotAPI/libraries/armem/server/ltm/Memory.cpp
#	source/RobotAPI/libraries/armem/server/ltm/ProviderSegment.cpp

Now stores now created Data after start LTM Recording start

-"Error during LTM consollidation"

feature : loading LTM information on WM startup

See merge request !479

Merge branch 'feature/loadLTMonStartup' of git.h2t.iar.kit.edu:sw/armarx/robot-api into feature/loadLTMonStartup

Merge branch 'feature/loadLTMonStartup' of git.h2t.iar.kit.edu:sw/armarx/robot-api into feature/loadLTMonStartup

# Conflicts:
#	source/RobotAPI/libraries/armem/server/ltm/detail/MemoryBase.h

update list of servers whenever the mns reconnects

See merge request !476

changed which timestamp is used for frequency filtering (time referenced) and deactivated storeOnStop

# Conflicts:
#	source/RobotAPI/libraries/armem/server/ltm/CoreSegment.cpp
#	source/RobotAPI/libraries/armem/server/ltm/EntityInstance.cpp
#	source/RobotAPI/libraries/armem/server/ltm/Memory.cpp
#	source/RobotAPI/libraries/armem/server/ltm/ProviderSegment.cpp

feature added: store snapshots from WM on stopRecording() if storeOnStop is true in properties of LTM
tested in Simulation

Familiar objects

See merge request !470

Merge branch 'feature/familiar-objects-in-object-memory-niklas' into 'feature/familiar-objects-in-object-memory'

draft

See merge request !477

Improvement of Skill Memory and Skill Memory GUI

See merge request !475

Increased timeout of skill RandomChaining to 2 minutes

This reverts commit cb37cc10.

Improved locking of subskillsMutex during callSubskillAsync to avoid possible deadlock during abortion of skills