Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

58431a64

Commit 58431a64 authored 10 years ago by Raphael Grimm

Downloads
- Plain Diff

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

parents b3ab5890 74f35a06

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/gui_plugins/RobotViewerPlugin/RobotViewerGuiPlugin.cpp 108 additions, 15 deletions

...PI/gui_plugins/RobotViewerPlugin/RobotViewerGuiPlugin.cpp
source/RobotAPI/gui_plugins/RobotViewerPlugin/RobotViewerGuiPlugin.h 3 additions, 1 deletion

...tAPI/gui_plugins/RobotViewerPlugin/RobotViewerGuiPlugin.h
source/RobotAPI/gui_plugins/RobotViewerPlugin/RobotViewerGuiPlugin.ui 39 additions, 2 deletions

...API/gui_plugins/RobotViewerPlugin/RobotViewerGuiPlugin.ui
source/RobotAPI/libraries/core/remoterobot/RemoteRobot.cpp 0 additions, 9 deletions

source/RobotAPI/libraries/core/remoterobot/RemoteRobot.cpp
source/RobotAPI/libraries/core/remoterobot/RemoteRobot.h 67 additions, 63 deletions

source/RobotAPI/libraries/core/remoterobot/RemoteRobot.h
source/RobotAPI/libraries/core/remoterobot/RemoteRobotNode.cpp 14 additions, 1 deletion

...e/RobotAPI/libraries/core/remoterobot/RemoteRobotNode.cpp

with 231 additions and 91 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