Merge branch 'master' of cgogn:~jund/CGoGN
Conflicts: include/Algo/BooleanOperator/mergeVertices.hpp include/Algo/Export/exportPov.h include/Algo/MovingObjects/particle_cell_2D.h
Please register or sign in to comment
Conflicts: include/Algo/BooleanOperator/mergeVertices.hpp include/Algo/Export/exportPov.h include/Algo/MovingObjects/particle_cell_2D.h