Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
RobotAPI
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Container Registry
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software
ArmarX
RobotAPI
Commits
4fb829bf
Commit
4fb829bf
authored
3 years ago
by
Fabian Reister
Browse files
Options
Downloads
Plain Diff
Merge branch 'armem/dev' into feature/armem_robot_state_update
parents
0b0fbb28
7a661313
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!157
armem/dev => master
,
!154
armem_robot_state: updates
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
scenarios/ArMemObjectMemory/config/ObjectMemory.cfg
+18
-2
18 additions, 2 deletions
scenarios/ArMemObjectMemory/config/ObjectMemory.cfg
source/RobotAPI/libraries/armem_objects/server/instance/Segment.h
+2
-1
2 additions, 1 deletion
...obotAPI/libraries/armem_objects/server/instance/Segment.h
with
20 additions
and
3 deletions
Loading
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
