fixed merge errors
Showing
- source/RobotComponents/components/MMMPlayer/CMakeLists.txt 1 addition, 1 deletionsource/RobotComponents/components/MMMPlayer/CMakeLists.txt
- source/RobotComponents/components/MMMPlayer/MMMPlayer.cpp 2 additions, 3 deletionssource/RobotComponents/components/MMMPlayer/MMMPlayer.cpp
- source/RobotComponents/components/MMMPlayer/MMMPlayer.h 5 additions, 4 deletionssource/RobotComponents/components/MMMPlayer/MMMPlayer.h
- source/RobotComponents/gui-plugins/CMakeLists.txt 1 addition, 1 deletionsource/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 deletionssource/RobotComponents/interface/CMakeLists.txt
- source/RobotComponents/interface/components/MMMPlayerInterface.ice 22 additions, 23 deletions...botComponents/interface/components/MMMPlayerInterface.ice
Please register or sign in to comment