Merge cgogn:~/CGoGN into HEAD
Conflicts: include/Algo/Modelisation/subdivision.h include/Algo/Modelisation/subdivision.hpp src/Topology/map/map3.cpp
Please register or sign in to comment
Conflicts: include/Algo/Modelisation/subdivision.h include/Algo/Modelisation/subdivision.hpp src/Topology/map/map3.cpp