songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cgal/Spatial_sorting/examples
History
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
..
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