GitLab

Conflicts:
	include/Algo/Geometry/centroid.h
	include/Algo/Geometry/centroid.hpp
	include/Algo/Import/importMesh.hpp
	include/Algo/Import/importNodeEle.hpp
	include/Algo/Import/importObjEle.hpp
	include/Algo/Import/importTet.hpp
	include/Algo/Import/importTs.hpp
	include/Algo/Modelisation/polyhedron.hpp
	include/Algo/Modelisation/primitives3d.hpp
	include/Algo/Modelisation/subdivision.h
	include/Algo/Modelisation/subdivision.hpp
	include/Algo/Multiresolution/Map2MR/Filters/bertram.h
	include/Algo/Multiresolution/Map2MR/Filters/lerp.h
	include/Algo/Multiresolution/Map3MR/Filters/lerp.h
	include/Algo/Multiresolution/Map3MR/map3MR_PrimalRegular.hpp
	include/Topology/generic/attributeHandler.h
	src/Topology/map/map3.cpp
	src/Utils/Shaders/shaderSimpleTexture.cpp