Conflicts:
	apps_cmake.txt
	include/Algo/ImplicitHierarchicalMesh/ihm3.hppxx
	include/Algo/ImplicitHierarchicalMesh/ihm3.hxx
	include/Algo/Modelisation/subdivision3.h
	include/Algo/Modelisation/subdivision3.hpp
	include/Algo/Modelisation/tetrahedralization.hpp