• untereiner's avatar
    Merge cgogn:~thery/CGoGN · d7f201ae
    untereiner authored
    Conflicts:
    	include/Algo/Decimation/edgeSelector.h
    	include/Algo/Modelisation/tetrahedralization.hpp
    	include/Algo/Multiresolution/Map2MR/map2MR_PM.hpp
    	include/Algo/Multiresolution/Map3MR/map3MR_PrimalAdapt.hpp
    	include/Algo/Multiresolution/Map3MR/map3MR_PrimalRegular.hpp
    	include/Algo/Selection/raySelector.hpp
    	include/Topology/map/map2.h
    	src/Topology/map/map2.cpp
    d7f201ae
edgeSelector.h 20.8 KB