mirror of https://github.com/CGAL/cgal
The conflict was about whitesapce Approved by the release manager Conflicts: Polyhedron/include/CGAL/Polyhedron_copy_3.h |
||
|---|---|---|
| .. | ||
| doc/Surface_mesh_parameterization | ||
| doc_tex | ||
| examples/Surface_mesh_parameterization | ||
| include/CGAL | ||
| package_info/Surface_mesh_parameterization | ||
| test/Surface_mesh_parameterization | ||
| dont_submit | ||