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

..

benchmark/Spatial_sorting

Add simple benchmark

2012-03-09 15:07:38 +00:00

doc/Spatial_sorting

restore figure source files removed in 0fa2cacb

2014-02-10 14:54:23 +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

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

2014-07-03 16:34:46 +02: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

Put doc/ in the global dont_submit file

2013-08-20 10:57:03 +02:00