cgal/Spatial_sorting
Sébastien Loriot 17dd21def5 Merge branch 'First_of_pair_property_map-new_version-iyaz-old' into First_of_pair_property_map-new_version-iyaz
Conflicts:
	Point_set_processing_3/examples/Point_set_processing_3/property_map.cpp
	Point_set_processing_3/include/CGAL/IO/read_off_points.h
	Point_set_processing_3/include/CGAL/IO/read_xyz_points.h
	Point_set_processing_3/include/CGAL/IO/write_off_points.h
	Point_set_processing_3/include/CGAL/IO/write_xyz_points.h
	Point_set_processing_3/include/CGAL/Point_with_normal_3.h
	Point_set_processing_3/include/CGAL/improved_jet_smooth_point_set.h
	Point_set_processing_3/include/CGAL/improved_laplacian_smooth_point_set.h
	Point_set_processing_3/include/CGAL/jet_estimate_normals.h
	Point_set_processing_3/include/CGAL/jet_smooth_point_set.h
	Point_set_processing_3/include/CGAL/pca_estimate_normals.h
	Point_set_processing_3/include/CGAL/pca_smooth_point_set.h
2013-05-06 15:57:36 +02:00
..
doc/Spatial_sorting no backtick in tparam 2013-03-14 17:25:29 +01:00
doc_tex Revert "Merge the changes to ccPrecond and ccPostcond that have been in" 2012-11-23 18:04:33 +01:00
examples/Spatial_sorting Merge branch 'First_of_pair_property_map-new_version-iyaz-old' into First_of_pair_property_map-new_version-iyaz 2013-05-06 15:57:36 +02:00
include/CGAL remove typedef shadowing template parameter 2013-01-15 08:59:47 +01:00
package_info/Spatial_sorting New license.txt files (eol changes) 2013-02-19 16:46:39 +01:00
test/Spatial_sorting reorder Kernel and Policy of hilbert_sort 2013-01-14 16:00:55 +01:00
dont_submit add doc in dont_submit 2012-11-27 08:42:02 +01:00