Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

N

Navigation
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

50e89b92

Commit 50e89b92 authored 3 years ago by Fabian Reister

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/feature/grasping-challenge'

parents d4b71d7a 842d5bbc

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

source/armarx/navigation/client/ComponentPlugin.cpp 2 additions, 4 deletions

source/armarx/navigation/client/ComponentPlugin.cpp
source/armarx/navigation/client/ComponentPlugin.h 3 additions, 3 deletions

source/armarx/navigation/client/ComponentPlugin.h
source/armarx/navigation/client/services/MemorySubscriber.cpp 25 additions, 0 deletions

...ce/armarx/navigation/client/services/MemorySubscriber.cpp
source/armarx/navigation/client/services/MemorySubscriber.h 4 additions, 0 deletions

source/armarx/navigation/client/services/MemorySubscriber.h
source/armarx/navigation/components/Navigator/Navigator.cpp 1 addition, 1 deletion

source/armarx/navigation/components/Navigator/Navigator.cpp

with 35 additions and 8 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment