Merge cgogn:~untereiner/CGoGN
Conflicts: include/Algo/Modelisation/polyhedron.hpp
Showing
... | ... | @@ -227,7 +227,7 @@ Dart TopoRender::pickColor(unsigned int x, unsigned int y) |
Conflicts: include/Algo/Modelisation/polyhedron.hpp
... | ... | @@ -227,7 +227,7 @@ Dart TopoRender::pickColor(unsigned int x, unsigned int y) |