Sébastien Loriot
c8fb9844aa
Merge branch 'gsoc2011-surface-modeling-Yzju' into Surface_modeling-new_package-GF
Conflicts:
.gitattributes
AABB_tree/doc_tex/AABB_tree_ref/AABBGeomTraits.tex
AABB_tree/doc_tex/AABB_tree_ref/AABBTraits.tex
AABB_tree/dont_submit
AABB_tree/test/AABB_tree/AABB_test_util.h
AABB_tree/test/AABB_tree/aabb_correctness_triangle_test.cpp
Arrangement_on_surface_2/include/CGAL/Arr_point_location/Trapezoidal_decomposition_2_impl.h
Boolean_set_operations_2/examples/Boolean_set_operations_2/bezier_traits_adapter2.cpp
Installation/cmake/modules/CGAL_CreateSingleSourceCGALProgram.cmake
Installation/cmake/modules/CGAL_Macros.cmake
Installation/cmake/modules/CGAL_SetupDependencies.cmake
Linear_cell_complex/examples/Linear_cell_complex/linear_cell_complex_3_triangulation.cpp
Maintenance/svn_server/hooks/Mail/Sender/CType/Ext.pm
Polyhedron/demo/Polyhedron/CMakeLists.txt
Polyhedron/demo/Polyhedron/Polyhedron_demo_normal_estimation_plugin.cpp
Polyhedron/demo/Polyhedron/Polyhedron_demo_point_set_outliers_removal_plugin.cpp
Polyhedron/demo/Polyhedron/data/cow.off
Principal_component_analysis/test/Principal_component_analysis/linear_least_squares_fitting_segments_3.cpp
Surface_mesh_parameterization/examples/Surface_mesh_parameterization/CMakeLists.txt
Surface_reconstruction_points_3/include/CGAL/Poisson_reconstruction_function.h