Sébastien Loriot 2892c2fb4e Merge branch 'Surface_modeling-new_package-GF-old' into Surface_modeling-new_package-GF ... Conflicts: Documentation/biblio/geom.bib Documentation/doxyassist.xml		2014-04-08 14:41:09 +02:00
..
cgal_manual.bib	Merge branch 'Surface_modeling-new_package-GF-old' into Surface_modeling-new_package-GF	2013-08-06 16:34:47 +02: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