Laurent Rineau 8535a3c03c Merge branch 'releases/CGAL-4.14-branch' ... # Conflicts: # Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Apollonius_graph_2_impl.h # Convex_hull_3/include/CGAL/convex_hull_3.h # Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Corefinement/face_graph_utils.h # Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Mesh_3_plugin_cgal_code.cpp # Stream_support/include/CGAL/IO/Color.h		2019-06-20 14:20:37 +02:00
..
Apollonius_graph_2	Merge branch 'releases/CGAL-4.14-branch'	2019-06-20 14:20:37 +02:00
Apollonius_graph_2.h	Derecursify Apollonius_graph_2::expand_conflict_region()	2019-06-18 13:18:25 +02:00
Apollonius_graph_data_structure_2.h	add SPDX identifier for files under the GPL-3+ license	2017-11-12 10:17:51 +01:00
Apollonius_graph_filtered_traits_2.h	add SPDX identifier for files under the GPL-3+ license	2017-11-12 10:17:51 +01:00
Apollonius_graph_hierarchy_2.h	add SPDX identifier for files under the GPL-3+ license	2017-11-12 10:17:51 +01:00
Apollonius_graph_hierarchy_vertex_base_2.h	add SPDX identifier for files under the GPL-3+ license	2017-11-12 10:17:51 +01:00
Apollonius_graph_traits_2.h	add SPDX identifier for files under the GPL-3+ license	2017-11-12 10:17:51 +01:00
Apollonius_graph_vertex_base_2.h	add SPDX identifier for files under the GPL-3+ license	2017-11-12 10:17:51 +01:00
Apollonius_site_2.h	Revert the merge of two pull-requests that target CGAL-4.14-branch	2019-05-14 17:50:45 +02:00
Hyperbola_2.h	add SPDX identifier for files under the GPL-3+ license	2017-11-12 10:17:51 +01:00
Hyperbola_ray_2.h	add SPDX identifier for files under the GPL-3+ license	2017-11-12 10:17:51 +01:00
Hyperbola_segment_2.h	add SPDX identifier for files under the GPL-3+ license	2017-11-12 10:17:51 +01:00
Parabola_2.h	Add typename	2019-05-03 15:15:43 +02:00
Parabola_segment_2.h	add SPDX identifier for files under the GPL-3+ license	2017-11-12 10:17:51 +01:00
functions_on_signs.h	add SPDX identifier for files under the GPL-3+ license	2017-11-12 10:17:51 +01:00
in_place_edge_list.h	add SPDX identifier for files under the GPL-3+ license	2017-11-12 10:17:51 +01:00
more_functions_on_signs.h	add SPDX identifier for files under the GPL-3+ license	2017-11-12 10:17:51 +01:00