Sébastien Loriot 7cabb0c508 Merge branch 'rebase/Mesh_2-add_optimizers-GF-old' into rebase/Mesh_2-add_optimizers-GF ... Conflicts: GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.cpp GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.ui Triangulation_2/include/CGAL/Constrained_Delaunay_triangulation_2.h		2015-05-19 09:01:20 +02:00
..
Projection_traits_3.h	Merge branch 'rebase/Mesh_2-add_optimizers-GF-old' into rebase/Mesh_2-add_optimizers-GF	2015-05-19 09:01:20 +02:00