Skip to content
Snippets Groups Projects
Commit e2f083f8 authored by Mirko Wächter's avatar Mirko Wächter
Browse files

Merge branch 'master' into 'meshInflating' 

# Conflicts:
#   VirtualRobot/Visualization/CoinVisualization/CoinVisualizationFactory.h
#   VirtualRobot/Visualization/TriMeshModel.cpp
#   VirtualRobot/Visualization/TriMeshModel.h
parents 2673aa3b d3d9d367
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 221 additions and 95 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment