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

..

CGAL

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

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