Skip to content
Snippets Groups Projects
Commit d94f19a5 authored by Fabian Tërnava's avatar Fabian Tërnava
Browse files

Merge branch 'armem/dev' of https://gitlab.com/ArmarX/RobotAPI into feature/diskMemory 

# Conflicts:
#	source/RobotAPI/libraries/armem_gui/MemoryViewer.cpp
#	source/RobotAPI/libraries/armem_gui/MemoryViewer.h
parents 7cfe05a1 7dd1cd3b
No related branches found
No related tags found
2 merge requests!140armem/dev -> master,!136Memory structure changes, query_proc structure changes (Base classes / templated)
Hide whitespace changes
Inline Side-by-side
Showing
with 144 additions and 58 deletions
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