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
..
include/CGAL	Fix last errors in headers of CGAL foundations	2012-10-08 09:03:50 +00:00
package_info/Distance_2	New license.txt files (eol changes)	2013-02-19 16:46:39 +01:00
test/Distance_2	Merge next into this branch. There have been conflicts in the	2012-04-24 15:06:19 +00:00