Merge armem/dev into refactor/new_arch(_armem) (!197) · Merge requests · Software / ArmarX / RobotAPI

Merged Rainer Kartmann requested to merge armem/dev into refactor/new_arch_armem 3 years ago

Nov 05, 2021

Add virtual destructors · ee063d86
Rainer Kartmann authored 3 years ago

ee063d86
Fix differing signedness · 8ca0bb3e
Rainer Kartmann authored 3 years ago

8ca0bb3e

Allow passing server memory to disk ltm · 780dea3f

Rainer Kartmann authored 3 years ago

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

780dea3f

Merge branch 'master' into armem/dev · df14a47e
Rainer Kartmann authored 3 years ago

df14a47e

Nov 02, 2021
- Merge branch 'armem/dev' of https://gitlab.com/ArmarX/RobotAPI into armem/dev · 2cf6d599
  Fabian Tërnava authored 3 years ago
  
  2cf6d599
- full working ltm pipeline · 8f3edae2
  Fabian Tërnava authored 3 years ago
  
  8f3edae2

Merge armem/dev into refactor/new_arch(_armem)

Merge request reports

Activity