Merge branch 'develop' of icube-forge.unistra.fr:cgogn/cgogn into develop
Conflicts: SCHNApps/Plugins/surface_renderVector/src/surface_renderVector_dockTab.cpp
Showing
Conflicts: SCHNApps/Plugins/surface_renderVector/src/surface_renderVector_dockTab.cpp