Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

5d4ee48e

Commit 5d4ee48e authored 9 years ago by Nikolaus Vahrenkamp

Downloads
- Patches
- Plain Diff

fixed merge errors

parent d35a883e

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotComponents/components/MMMPlayer/CMakeLists.txt 1 addition, 1 deletion

source/RobotComponents/components/MMMPlayer/CMakeLists.txt
source/RobotComponents/components/MMMPlayer/MMMPlayer.cpp 2 additions, 3 deletions

source/RobotComponents/components/MMMPlayer/MMMPlayer.cpp
source/RobotComponents/components/MMMPlayer/MMMPlayer.h 5 additions, 4 deletions

source/RobotComponents/components/MMMPlayer/MMMPlayer.h
source/RobotComponents/gui-plugins/CMakeLists.txt 1 addition, 1 deletion

source/RobotComponents/gui-plugins/CMakeLists.txt
source/RobotComponents/gui-plugins/MMMPlayerPlugin/CMakeLists.txt 1 addition, 1 deletion

...obotComponents/gui-plugins/MMMPlayerPlugin/CMakeLists.txt
source/RobotComponents/gui-plugins/MMMPlayerPlugin/MMMPlayerGuiPlugin.cpp 4 additions, 4 deletions

...onents/gui-plugins/MMMPlayerPlugin/MMMPlayerGuiPlugin.cpp
source/RobotComponents/gui-plugins/MMMPlayerPlugin/MMMPlayerGuiPlugin.h 5 additions, 5 deletions

...mponents/gui-plugins/MMMPlayerPlugin/MMMPlayerGuiPlugin.h
source/RobotComponents/interface/CMakeLists.txt 1 addition, 0 deletions

source/RobotComponents/interface/CMakeLists.txt
source/RobotComponents/interface/components/MMMPlayerInterface.ice 22 additions, 23 deletions

...botComponents/interface/components/MMMPlayerInterface.ice

with 42 additions and 42 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