Efi Fogel 3b6973dceb Merge branch 'Aos_2-boundary_objects-efic-old' into Aos_2-boundary_objects-efic ... Conflicts: Arrangement_on_surface_2/archive/include/CGAL/Arr_extended_rational_arc_traits_d_1.h Arrangement_on_surface_2/archive/include/CGAL/Arr_rational_arc_traits_2.h Arrangement_on_surface_2/include/CGAL/Arr_accessor.h Arrangement_on_surface_2/include/CGAL/Arr_algebraic_segment_traits_2.h Arrangement_on_surface_2/include/CGAL/Arr_counting_traits_2.h Arrangement_on_surface_2/include/CGAL/Arr_geodesic_arc_on_sphere_traits_2.h Arrangement_on_surface_2/include/CGAL/Arr_linear_traits_2.h Arrangement_on_surface_2/include/CGAL/Arr_observer.h Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_batched_point_location_traits_2.h Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_naive_point_location_impl.h Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_traits.h Arrangement_on_surface_2/include/CGAL/Arr_spherical_topology_traits_2.h Arrangement_on_surface_2/include/CGAL/Arr_tags.h Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_inc_insertion_zone_visitor.h Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_planar_topology_traits_base_2.h Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_unb_planar_insertion_helper.h Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_unb_planar_overlay_helper.h Arrangement_on_surface_2/include/CGAL/Arr_tracing_traits_2.h Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arr_traits_adaptor_2.h Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arr_traits_adaptor_2_dispatching.h Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arrangement_on_surface_2_global.h Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arrangement_on_surface_2_impl.h Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arrangement_zone_2_impl.h Arrangement_on_surface_2/include/CGAL/Arrangement_on_surface_2.h Arrangement_on_surface_2/include/CGAL/Arrangement_zone_2.h Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Arc_2.h Arrangement_on_surface_2/include/CGAL/IO/Arr_text_formatter.h Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_op.h Sweep_line_2/include/CGAL/Sweep_line_2/Arr_basic_insertion_traits_2.h Sweep_line_2/include/CGAL/Sweep_line_2/Arr_overlay_traits_2.h Sweep_line_2/include/CGAL/Sweep_line_2/Sweep_line_functors.h		2017-11-20 18:38:03 +02:00
..
CGAL	Merge branch 'Aos_2-boundary_objects-efic-old' into Aos_2-boundary_objects-efic	2017-11-20 18:38:03 +02:00