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
..
Test	use more types	2013-02-07 11:02:14 +01:00
Bigfloat_interval_traits.h	change LGPLv2 -> LGPLv3	2011-10-10 13:48:25 +00:00
Interval_traits.h	Integrate boost::variant with Lazy kernels interaction	2012-12-06 17:27:23 +01:00
convert_to_bfi.h	merge changes from next	2012-01-09 12:33:39 +00:00