Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

RobotAPI
- Activity
- Members
- Labels
- Container Registry
- Model registry

Snippets Groups Projects

23526cee

Commit 23526cee authored 10 years ago by Simon Ottenhaus

Downloads
- Plain Diff

Merge branch 'master' of https://i61wiki.itec.uka.de/git/robot-api

Conflicts:
	source/RobotAPI/libraries/drivers/WeissHapticSensor/WeissHapticSensor.cpp

parents c796c635 b95ceaa8

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 5 additions, 0 deletions

.gitignore
source/RobotAPI/components/units/HapticObserver.cpp 1 addition, 0 deletions

source/RobotAPI/components/units/HapticObserver.cpp
source/RobotAPI/gui_plugins/HapticUnitPlugin/HapticUnitGuiPlugin.cpp 53 additions, 48 deletions

...tAPI/gui_plugins/HapticUnitPlugin/HapticUnitGuiPlugin.cpp
source/RobotAPI/gui_plugins/HapticUnitPlugin/HapticUnitGuiPlugin.h 6 additions, 3 deletions

...botAPI/gui_plugins/HapticUnitPlugin/HapticUnitGuiPlugin.h
source/RobotAPI/libraries/drivers/WeissHapticSensor/WeissHapticSensor.cpp 1 addition, 1 deletion

...libraries/drivers/WeissHapticSensor/WeissHapticSensor.cpp

with 66 additions and 52 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