Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Simox
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules

Snippets Groups Projects

db217e76

Commit db217e76 authored 9 years ago by Nikolaus Vahrenkamp

Downloads
- Plain Diff

Merge branch 'master' of gitlab.com:Simox/simox

Conflicts:
	VirtualRobot/Nodes/RobotNode.h

parents 63695aaa 1792bfb8

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

VirtualRobot/Nodes/RobotNode.h 4 additions, 2 deletions

VirtualRobot/Nodes/RobotNode.h
VirtualRobot/Visualization/CoinVisualization/CoinVisualizationFactory.cpp 5 additions, 3 deletions

...ualization/CoinVisualization/CoinVisualizationFactory.cpp
VirtualRobot/Visualization/CoinVisualization/CoinVisualizationFactory.h 5 additions, 1 deletion

...isualization/CoinVisualization/CoinVisualizationFactory.h
VirtualRobot/XML/ObjectIO.h 5 additions, 4 deletions

VirtualRobot/XML/ObjectIO.h
VirtualRobot/examples/CameraViewer/CMakeLists.txt 15 additions, 4 deletions

VirtualRobot/examples/CameraViewer/CMakeLists.txt
VirtualRobot/examples/CameraViewer/CameraViewer.ui 241 additions, 145 deletions

VirtualRobot/examples/CameraViewer/CameraViewer.ui
VirtualRobot/examples/CameraViewer/showCamWindow.cpp 212 additions, 19 deletions

VirtualRobot/examples/CameraViewer/showCamWindow.cpp
VirtualRobot/examples/CameraViewer/showCamWindow.h 20 additions, 2 deletions

VirtualRobot/examples/CameraViewer/showCamWindow.h
config.cmake 1 addition, 1 deletion

config.cmake

with 508 additions and 181 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