Philipp Möller d198458ca7 Merge branch 'origin-gsoc2011-boost_object-pmoeller' into Kernel-replace_object-pmoeller ... Conflicts: .gitattributes AABB_tree/doc_tex/AABB_tree_ref/AABBGeomTraits.tex AABB_tree/doc_tex/AABB_tree_ref/AABBTraits.tex AABB_tree/doc_tex/AABB_tree_ref/AABB_traits.tex AABB_tree/include/CGAL/AABB_traits.h AABB_tree/include/CGAL/AABB_tree.h AABB_tree/test/AABB_tree/AABB_test_util.h Arrangement_on_surface_2/doc_tex/Arrangement_on_surface_2/arr_queries.tex Arrangement_on_surface_2/doc_tex/Arrangement_on_surface_2_ref/Arr_trapezoid_ric_point_location.tex Arrangement_on_surface_2/doc_tex/Arrangement_on_surface_2_ref/intro.tex Arrangement_on_surface_2/include/CGAL/Arr_batched_point_location.h Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_lm_generator_base.h Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_lm_random_generator.h Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_trapezoid_ric_pl_impl.h Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_walk_along_line_pl_impl.h Arrangement_on_surface_2/include/CGAL/Arr_trapezoid_ric_point_location.h Arrangement_on_surface_2/test/Arrangement_on_surface_2/point_location.cpp Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_line_arc_2.h Circular_kernel_3/include/CGAL/Circular_kernel_3/internal_functions_on_circular_arc_3.h Circular_kernel_3/include/CGAL/Circular_kernel_3/internal_functions_on_line_arc_3.h Circular_kernel_3/include/CGAL/Circular_kernel_3/internal_functions_on_sphere_3.h Filtered_kernel/include/CGAL/Lazy.h Filtered_kernel/include/CGAL/Lazy_kernel.h Intersections_2/include/CGAL/Triangle_2_Iso_rectangle_2_intersection.h Intersections_2/test/Intersections_2/test_intersections_2.cpp Intersections_3/test/Intersections_3/test_intersections_3.cpp Kernel_23/doc_tex/Kernel_23_ref/intersection.tex Kernel_23/include/CGAL/Kernel/Type_mapper.h Kernel_d/doc_tex/Kernel_d_ref/Kernel.tex		2012-12-04 17:57:53 +01:00
..
AABB_tree	Convert all CRLF files to LF	2012-12-03 18:44:24 +01:00
AABB_tree_ref	Merge branch 'origin-gsoc2011-boost_object-pmoeller' into Kernel-replace_object-pmoeller	2012-12-04 17:57:53 +01:00