Skip to content
Snippets Groups Projects

armem/dev => master

Merged armem/dev => master
armem/dev into master
Merged Fabian Reister requested to merge armem/dev into master
Viewing commit 0fb8d5fa
Prev Next
Show latest version
2 files
+ 2
− 2
Compare changes
  • Side-by-side
  • Inline
Files
2
source/RobotAPI/libraries/armem_objects/server/attachments/Segment.h
+ 1
− 1
@@ -70,7 +70,7 @@ namespace armarx::armem::server::obj::attachments
void init();
std::vector<armarx::armem::attachments::ObjectAttachment> getAttachments(const armem::Time& timestamp) const;
std::vector<armarx::armem::attachment::ObjectAttachment> getAttachments(const armem::Time& timestamp) const;
private: