Skip to content
Snippets Groups Projects
Commit e4a590c3 authored by Rainer Kartmann's avatar Rainer Kartmann
Browse files

Merge branch 'armem/set_memory' into armem/memory 

# Conflicts:
#	source/RobotAPI/libraries/armem/client/Reader.h
#	source/RobotAPI/libraries/armem/client/Writer.h
parents a51bf35a 5f04ce8d
No related branches found
No related tags found
2 merge requests!102ArMem Memory Updates,!101feature: Add setter methods to initialize plugins with a Memory from component.
Hide whitespace changes
Inline Side-by-side
Showing
with 53 additions and 1 deletion
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