Sébastien Loriot fee85470c1 Merge branch 'Triangulation_3-determinism-gf' into to-be-tested/Triangulation_3-determinism-gf ...

Conflicts:
	.gitattributes
	Matrix_search/include/CGAL/rectangular_3_center_2.h
	Spatial_sorting/include/CGAL/spatial_sort.h

2014-07-03 16:34:46 +02:00

..

Hilbert_policy_tags.h

change LGPLv2 -> LGPLv3

2011-10-10 13:48:25 +00:00

Hilbert_sort_2.h

change LGPLv2 -> LGPLv3

2011-10-10 13:48:25 +00:00

Hilbert_sort_3.h

change LGPLv2 -> LGPLv3

2011-10-10 13:48:25 +00:00

Hilbert_sort_base.h

spatial_sort is ~15% slower with the CGAL::nth_element than with the one

2012-03-09 15:01:39 +00:00

Hilbert_sort_d.h

change LGPLv2 -> LGPLv3

2011-10-10 13:48:25 +00:00

Hilbert_sort_median_2.h

change LGPLv2 -> LGPLv3

2011-10-10 13:48:25 +00:00

Hilbert_sort_median_3.h

change LGPLv2 -> LGPLv3

2011-10-10 13:48:25 +00:00

Hilbert_sort_median_d.h

change LGPLv2 -> LGPLv3

2011-10-10 13:48:25 +00:00

Hilbert_sort_middle_2.h

change LGPLv2 -> LGPLv3

2011-10-10 13:48:25 +00:00

Hilbert_sort_middle_3.h

change LGPLv2 -> LGPLv3

2011-10-10 13:48:25 +00:00

Hilbert_sort_middle_base.h

change LGPLv2 -> LGPLv3

2011-10-10 13:48:25 +00:00

Hilbert_sort_middle_d.h

change LGPLv2 -> LGPLv3

2011-10-10 13:48:25 +00:00

hilbert_sort.h

Merge branch 'Triangulation_3-determinism-gf' into to-be-tested/Triangulation_3-determinism-gf

2014-07-03 16:34:46 +02:00

Multiscale_sort.h

change LGPLv2 -> LGPLv3

2011-10-10 13:48:25 +00:00

Spatial_sort_traits_adapter_2.h

change LGPLv2 -> LGPLv3

2011-10-10 13:48:25 +00:00

Spatial_sort_traits_adapter_3.h

change LGPLv2 -> LGPLv3

2011-10-10 13:48:25 +00:00

Spatial_sort_traits_adapter_d.h

change LGPLv2 -> LGPLv3

2011-10-10 13:48:25 +00:00

spatial_sort.h

Merge branch 'Triangulation_3-determinism-gf' into to-be-tested/Triangulation_3-determinism-gf

2014-07-03 16:34:46 +02:00