Skip to content
Snippets Groups Projects
Commit b4e03087 authored by Joana Plewnia's avatar Joana Plewnia
Browse files

Merge branch 'feature/verbalization' into 'feature/verbalizationAndVisualization' 

# Conflicts:
#   source/armarx/speech/skills/object_last_seen_at/core/ObjectLastSeenAt.cpp
#   source/armarx/speech/skills/scene_knowledge_verbalization/skills/CMakeLists.txt
#   source/armarx/speech/skills/scene_knowledge_verbalization/skills/ObjectsAtLocation.cpp
parents b83295e6 a9698565
No related branches found
No related tags found
3 merge requests!16Combined changes from verbalization and rtlntv branch,!14Verbalization,!12added parallelization of search, for LTM sizes < 1 day the speedup is too...
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment