Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

915d8796

Commit 915d8796 authored 5 years ago by Mirko Wächter

Downloads
- Plain Diff

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

# Conflicts:
#	VirtualRobot/Visualization/TriMeshModel.cpp

parents 156ad64a 02f2f826

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

VirtualRobot/ManipulationObject.cpp 4 additions, 0 deletions

VirtualRobot/ManipulationObject.cpp
VirtualRobot/ManipulationObject.h 1 addition, 1 deletion

VirtualRobot/ManipulationObject.h
VirtualRobot/Visualization/CoinVisualization/CoinVisualizationFactory.cpp 21 additions, 6 deletions

...ualization/CoinVisualization/CoinVisualizationFactory.cpp
VirtualRobot/Visualization/CoinVisualization/CoinVisualizationFactory.h 9 additions, 0 deletions

...isualization/CoinVisualization/CoinVisualizationFactory.h
VirtualRobot/Visualization/TriMeshModel.cpp 19 additions, 9 deletions

VirtualRobot/Visualization/TriMeshModel.cpp
VirtualRobot/Visualization/TriMeshModel.h 1 addition, 0 deletions

VirtualRobot/Visualization/TriMeshModel.h

with 55 additions and 16 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