Merge remote-tracking branch 'origin/master' into feature/cleanup-and-opencv4-include
No related branches found
No related tags found
This commit is part of merge request !499. Comments created here will be created in the context of that merge request.
Showing
- source/RobotAPI/libraries/RobotUnitDataStreamingReceiver/RobotUnitDataStreamingReceiver.cpp 1 addition, 1 deletion...tDataStreamingReceiver/RobotUnitDataStreamingReceiver.cpp
- source/RobotAPI/libraries/armem_grasping/server/KnownGraspProviderSegment.cpp 4 additions, 1 deletion...aries/armem_grasping/server/KnownGraspProviderSegment.cpp
- source/RobotAPI/libraries/armem_objects/client/articulated_object/ArticulatedObjectReader.cpp 13 additions, 22 deletions...cts/client/articulated_object/ArticulatedObjectReader.cpp
- source/RobotAPI/libraries/armem_objects/client/articulated_object/ArticulatedObjectWriter.cpp 3 additions, 2 deletions...cts/client/articulated_object/ArticulatedObjectWriter.cpp
- source/RobotAPI/libraries/armem_objects/client/articulated_object/ArticulatedObjectWriter.h 3 additions, 3 deletions...jects/client/articulated_object/ArticulatedObjectWriter.h
- source/RobotAPI/libraries/armem_objects/client/articulated_object/Reader.cpp 14 additions, 9 deletions...raries/armem_objects/client/articulated_object/Reader.cpp
- source/RobotAPI/libraries/armem_objects/client/articulated_object/Writer.cpp 15 additions, 6 deletions...raries/armem_objects/client/articulated_object/Writer.cpp
- source/RobotAPI/libraries/armem_objects/client/articulated_object/Writer.h 2 additions, 2 deletions...ibraries/armem_objects/client/articulated_object/Writer.h
- source/RobotAPI/libraries/armem_objects/client/articulated_object/interfaces.h 1 addition, 1 deletion...ries/armem_objects/client/articulated_object/interfaces.h
- source/RobotAPI/libraries/armem_objects/server/familiar_object_instance/Visu.cpp 9 additions, 1 deletion...es/armem_objects/server/familiar_object_instance/Visu.cpp
Loading
Please register or sign in to comment