Sébastien Loriot 63406293e1 Merge branch 'Projection_traits-add_more_functors-sloriot' into barycentric_coordinates_2-dmitry ... Conflicts: Documentation/biblio/cgal_manual.bib Documentation/doc/Documentation/Doxyfile.in Documentation/doc/Documentation/dependencies		2014-12-12 14:24:17 +01:00
..
cgal_manual.bib	Merge branch 'Projection_traits-add_more_functors-sloriot' into barycentric_coordinates_2-dmitry	2014-12-12 14:24:17 +01:00
geom.bib	Merge branch 'Surface_modeling-new_package-GF-old' into Surface_modeling-new_package-GF	2014-04-08 14:41:09 +02:00