Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

RobotAPI
- Activity
- Members
- Labels
- Terraform modules

Snippets Groups Projects

8e477923

Commit 8e477923 authored 7 years ago by Raphael

Downloads
- Patches
- Plain Diff

apply autoformatting

remove leftovers from a merge conflict (pushed .orig files)

parent bee4ba5c

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/applications/CMakeLists.txt.orig 0 additions, 34 deletions

source/RobotAPI/applications/CMakeLists.txt.orig
source/RobotAPI/components/DebugDrawer/DebugDrawerComponent.cpp 1 addition, 1 deletion

.../RobotAPI/components/DebugDrawer/DebugDrawerComponent.cpp
source/RobotAPI/components/units/CMakeLists.txt.orig 0 additions, 90 deletions

source/RobotAPI/components/units/CMakeLists.txt.orig
source/RobotAPI/components/units/ForceTorqueObserver.cpp 1 addition, 1 deletion

source/RobotAPI/components/units/ForceTorqueObserver.cpp
source/RobotAPI/drivers/CMakeLists.txt.orig 0 additions, 9 deletions

source/RobotAPI/drivers/CMakeLists.txt.orig
source/RobotAPI/drivers/HokuyoLaserUnit/HokuyoLaserUnit.cpp 4 additions, 4 deletions

source/RobotAPI/drivers/HokuyoLaserUnit/HokuyoLaserUnit.cpp
source/RobotAPI/gui-plugins/LaserScannerPlugin/LaserScannerPluginWidgetController.cpp 5 additions, 5 deletions

...LaserScannerPlugin/LaserScannerPluginWidgetController.cpp
source/RobotAPI/gui-plugins/LaserScannerPlugin/LaserScannerPluginWidgetController.h 2 additions, 2 deletions

...s/LaserScannerPlugin/LaserScannerPluginWidgetController.h

with 13 additions and 146 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