Maxime Gimeno 549568a954 Fix conflicts		2019-01-22 10:08:48 +01:00
..
cgal_manual.bib	Fix conflicts	2019-01-22 10:08:48 +01:00
geom.bib	fix urls in bib	2018-11-21 09:47:22 +01:00