Commit f505a305 authored 4 years ago by Christoph Pohl

Merge branch 'master' of gitlab.com:ArmarX/RobotAPI

parents aceae71a 2dbbb666

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/components/armem/ArMemExampleClient/ArMemExampleClient.cpp 36 additions, 39 deletions

...omponents/armem/ArMemExampleClient/ArMemExampleClient.cpp
source/RobotAPI/components/armem/ArMemExampleClient/ArMemExampleClient.h 5 additions, 12 deletions

.../components/armem/ArMemExampleClient/ArMemExampleClient.h
source/RobotAPI/components/armem/ArMemExampleClient/CMakeLists.txt 1 addition, 4 deletions

...botAPI/components/armem/ArMemExampleClient/CMakeLists.txt
source/RobotAPI/components/armem/ArMemExampleMemory/ArMemExampleMemory.cpp 5 additions, 5 deletions

...omponents/armem/ArMemExampleMemory/ArMemExampleMemory.cpp
source/RobotAPI/components/armem/ArMemExampleMemory/ArMemExampleMemory.h 2 additions, 11 deletions

.../components/armem/ArMemExampleMemory/ArMemExampleMemory.h
source/RobotAPI/components/armem/ArMemMemoryNameSystem/ArMemMemoryNameSystem.cpp 1 addition, 1 deletion

...nts/armem/ArMemMemoryNameSystem/ArMemMemoryNameSystem.cpp
source/RobotAPI/components/armem/ArMemMemoryNameSystem/ArMemMemoryNameSystem.h 6 additions, 6 deletions

...nents/armem/ArMemMemoryNameSystem/ArMemMemoryNameSystem.h
source/RobotAPI/components/units/SpeechObserver.cpp 0 additions, 2 deletions

source/RobotAPI/components/units/SpeechObserver.cpp
source/RobotAPI/components/units/SpeechObserver.h 1 addition, 1 deletion

source/RobotAPI/components/units/SpeechObserver.h
source/RobotAPI/gui-plugins/ArMemMemoryViewer/ArMemMemoryViewerWidgetController.cpp 47 additions, 64 deletions

...s/ArMemMemoryViewer/ArMemMemoryViewerWidgetController.cpp
source/RobotAPI/gui-plugins/ArMemMemoryViewer/ArMemMemoryViewerWidgetController.h 24 additions, 24 deletions

...ins/ArMemMemoryViewer/ArMemMemoryViewerWidgetController.h
source/RobotAPI/interface/CMakeLists.txt 15 additions, 7 deletions

source/RobotAPI/interface/CMakeLists.txt
source/RobotAPI/interface/armem.ice 6 additions, 4 deletions

source/RobotAPI/interface/armem.ice
source/RobotAPI/interface/armem/MemoryInterface.ice 0 additions, 17 deletions

source/RobotAPI/interface/armem/MemoryInterface.ice
source/RobotAPI/interface/armem/client.ice 3 additions, 0 deletions

source/RobotAPI/interface/armem/client.ice
source/RobotAPI/interface/armem/client/MemoryListenerInterface.ice 19 additions, 0 deletions

...botAPI/interface/armem/client/MemoryListenerInterface.ice
source/RobotAPI/interface/armem/commit.ice 2 additions, 14 deletions

source/RobotAPI/interface/armem/commit.ice
source/RobotAPI/interface/armem/memory.ice 0 additions, 2 deletions

source/RobotAPI/interface/armem/memory.ice
source/RobotAPI/interface/armem/mns.ice 3 additions, 0 deletions

source/RobotAPI/interface/armem/mns.ice
source/RobotAPI/interface/armem/mns/MemoryNameSystemInterface.ice 14 additions, 11 deletions

...obotAPI/interface/armem/mns/MemoryNameSystemInterface.ice

with 190 additions and 224 deletions

Please register or to comment