Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

9cfc9ee1

Commit 9cfc9ee1 authored 9 years ago by Mirko Waechter

Downloads
- Plain Diff

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

* 'master' of https://i61wiki.itec.uka.de/git/robot-api:
  updated name of haptic unit

parents 9ac1ede6 74f47b83

No related branches found

No related tags found

Loading

Changes 2

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/gui_plugins/HapticUnitPlugin/HapticUnitGuiPlugin.cpp 4 additions, 14 deletions

...tAPI/gui_plugins/HapticUnitPlugin/HapticUnitGuiPlugin.cpp
source/RobotAPI/gui_plugins/HapticUnitPlugin/HapticUnitGuiPlugin.h 1 addition, 0 deletions

...botAPI/gui_plugins/HapticUnitPlugin/HapticUnitGuiPlugin.h

with 5 additions and 14 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