Sébastien Loriot d6905c61be Merge branch 'Kernel-replace_object-pmoeller-old' into Kernel-replace_object-pmoeller ... Conflicts: AABB_tree/include/CGAL/AABB_tree.h Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_line_arc_2.h Intersections_3/include/CGAL/Intersections_3/intersection_3_1_impl.h Kernel_23/doc/Kernel_23/CGAL/intersections.h Kernel_23/doc/Kernel_23/Concepts/FunctionObjectConcepts.h STL_Extension/doc/STL_Extension/CGAL/iterator.h		2013-03-14 10:29:31 +01:00
..
Bbox_3_Bbox_3_do_intersect.h	Merge next into this branch. There have been conflicts in the	2012-04-24 15:06:19 +00:00
Bbox_3_Line_3_do_intersect.h	Revert previous commit for CGAL/internal/Intersections_3/Bbox_3_Line_3_do_intersect.h	2012-06-15 15:27:17 +00:00
Bbox_3_Plane_3_do_intersect.h	Merge next into this branch. There have been conflicts in the	2012-04-24 15:06:19 +00:00
Bbox_3_Ray_3_do_intersect.h	Merge branch 'origin-gsoc2011-boost_object-pmoeller' into Kernel-replace_object-pmoeller	2012-12-04 17:57:53 +01:00
Bbox_3_Segment_3_do_intersect.h	Merge branch 'Kernel-replace_object-pmoeller-old' into Kernel-replace_object-pmoeller	2013-03-14 10:29:31 +01:00
Bbox_3_Sphere_3_do_intersect.h	Merge next into this branch. There have been conflicts in the	2012-04-24 15:06:19 +00:00
Bbox_3_Triangle_3_do_intersect.h	Merge next into this branch. There have been conflicts in the	2012-04-24 15:06:19 +00:00
Triangle_3_Line_3_intersection.h	intersection_return now also uses result_of	2012-12-10 17:20:36 +01:00
Triangle_3_Ray_3_intersection.h	intersection_return now also uses result_of	2012-12-10 17:20:36 +01:00
Triangle_3_Segment_3_intersection.h	intersection_return now also uses result_of	2012-12-10 17:20:36 +01:00