Sébastien Loriot 6b15ec643c Merge branch 'CGAL-Qt5_support-GF' into cgal-public-dev/Polygon_mesh_processing-GF ... Conflicts: Mesh_3/demo/Mesh_3/include/CGAL/gl_render.h Polyhedron/demo/Polyhedron/CMakeLists.txt Polyhedron/demo/Polyhedron/GlSplat/GlSplat.cpp Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.h		2015-07-16 16:52:53 +02:00
..
CMakeLists.txt	CMake 2.8.11	2015-07-13 12:36:43 +02:00
cube-meshed.off	update example and add new one using the constrained edge map	2014-01-29 19:05:11 +01:00
cube.off	cgal_test and .cmd files added to make the testsuite work	2006-10-19 16:53:00 +00:00
edge_collapse_OpenMesh.cpp	use BGL named parameters	2015-02-17 20:14:59 +01:00
edge_collapse_constrain_sharp_edges.cmd	rename example and update examples.txt	2014-02-13 16:26:41 +01:00
edge_collapse_constrain_sharp_edges.cpp	use BGL named parameters	2015-02-17 20:14:59 +01:00
edge_collapse_constrained_border_polyhedron.cmd	update example and add new one using the constrained edge map	2014-01-29 19:05:11 +01:00
edge_collapse_constrained_border_polyhedron.cpp	use BGL named parameters	2015-02-17 20:14:59 +01:00
edge_collapse_constrained_border_surface_mesh.cmd	fix warnings and compilation issues	2014-12-10 17:34:51 +01:00
edge_collapse_constrained_border_surface_mesh.cpp	use BGL named parameters	2015-02-17 20:14:59 +01:00
edge_collapse_enriched_polyhedron.cmd	Edge_profile added	2006-11-17 17:46:36 +00:00
edge_collapse_enriched_polyhedron.cpp	use BGL named parameters	2015-02-17 20:14:59 +01:00
edge_collapse_polyhedron.cmd	Edge_profile added	2006-11-17 17:46:36 +00:00
edge_collapse_polyhedron.cpp	use BGL named parameters	2015-02-17 20:14:59 +01:00
edge_collapse_surface_mesh.cmd	fix warnings and compilation issues	2014-12-10 17:34:51 +01:00
edge_collapse_surface_mesh.cpp	use BGL named parameters	2015-02-17 20:14:59 +01:00
mesh_with_border.off	update example and add new one using the constrained edge map	2014-01-29 19:05:11 +01:00