Commit fbe06369 authored 2 years ago by Fabian Tërnava

Merge branch 'armem/ltm/dev' into fabianpk

# Conflicts:
#	source/RobotAPI/libraries/aron/converter/common/VectorConverter.h

parents 5ef12cd9 e89f9e16

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/libraries/armem/core/wm/aron_conversions.cpp 5 additions, 5 deletions

source/RobotAPI/libraries/armem/core/wm/aron_conversions.cpp
source/RobotAPI/libraries/armem/server/MemoryToIceAdapter.cpp 1 addition, 4 deletions

...ce/RobotAPI/libraries/armem/server/MemoryToIceAdapter.cpp
source/RobotAPI/libraries/armem/server/ltm/base/converter/Converter.h 1 addition, 1 deletion

...API/libraries/armem/server/ltm/base/converter/Converter.h
source/RobotAPI/libraries/armem/server/ltm/base/converter/image/Converter.cpp 2 additions, 2 deletions

...aries/armem/server/ltm/base/converter/image/Converter.cpp
source/RobotAPI/libraries/armem/server/ltm/base/converter/image/Converter.h 2 additions, 2 deletions

...braries/armem/server/ltm/base/converter/image/Converter.h
source/RobotAPI/libraries/armem/server/ltm/base/converter/image/exr/ExrConverter.cpp 2 additions, 2 deletions

...rmem/server/ltm/base/converter/image/exr/ExrConverter.cpp
source/RobotAPI/libraries/armem/server/ltm/base/converter/image/exr/ExrConverter.h 1 addition, 1 deletion

.../armem/server/ltm/base/converter/image/exr/ExrConverter.h
source/RobotAPI/libraries/armem/server/ltm/base/converter/image/png/PngConverter.cpp 4 additions, 4 deletions

...rmem/server/ltm/base/converter/image/png/PngConverter.cpp
source/RobotAPI/libraries/armem/server/ltm/base/converter/image/png/PngConverter.h 1 addition, 1 deletion

.../armem/server/ltm/base/converter/image/png/PngConverter.h
source/RobotAPI/libraries/armem/server/ltm/base/converter/object/Converter.cpp 2 additions, 2 deletions

...ries/armem/server/ltm/base/converter/object/Converter.cpp
source/RobotAPI/libraries/armem/server/ltm/base/converter/object/Converter.h 2 additions, 2 deletions

...raries/armem/server/ltm/base/converter/object/Converter.h
source/RobotAPI/libraries/armem/server/ltm/base/converter/object/bson/BsonConverter.cpp 2 additions, 2 deletions

...m/server/ltm/base/converter/object/bson/BsonConverter.cpp
source/RobotAPI/libraries/armem/server/ltm/base/converter/object/bson/BsonConverter.h 1 addition, 1 deletion

...mem/server/ltm/base/converter/object/bson/BsonConverter.h
source/RobotAPI/libraries/armem/server/ltm/base/converter/object/json/JsonConverter.cpp 2 additions, 2 deletions

...m/server/ltm/base/converter/object/json/JsonConverter.cpp
source/RobotAPI/libraries/armem/server/ltm/base/converter/object/json/JsonConverter.h 1 addition, 1 deletion

...mem/server/ltm/base/converter/object/json/JsonConverter.h
source/RobotAPI/libraries/armem/server/ltm/disk/CoreSegment.cpp 2 additions, 1 deletion

.../RobotAPI/libraries/armem/server/ltm/disk/CoreSegment.cpp
source/RobotAPI/libraries/armem/server/ltm/disk/Entity.cpp 3 additions, 2 deletions

source/RobotAPI/libraries/armem/server/ltm/disk/Entity.cpp
source/RobotAPI/libraries/armem/server/ltm/disk/EntitySnapshot.cpp 6 additions, 5 deletions

...botAPI/libraries/armem/server/ltm/disk/EntitySnapshot.cpp
source/RobotAPI/libraries/armem/server/ltm/disk/Memory.cpp 1 addition, 0 deletions

source/RobotAPI/libraries/armem/server/ltm/disk/Memory.cpp
source/RobotAPI/libraries/armem/server/ltm/disk/ProviderSegment.cpp 3 additions, 2 deletions

...otAPI/libraries/armem/server/ltm/disk/ProviderSegment.cpp

with 44 additions and 42 deletions

Please register or to comment