Sébastien Loriot 3f6c6b3369 Merge branch 'Generator-more_point_generators-pmachado' of git://github.com/sloriot/cgal into sloriot-Generator-more_point_generators-pmachado ... Conflicts: Generator/doc/Generator/Generator.txt Generator/doc/Generator/PackageDescription.txt Generator/doc/Generator/examples.txt Installation/changes.html		2015-04-15 16:25:34 +02:00
..
CGAL	Merge branch 'Generator-more_point_generators-pmachado' of git://github.com/sloriot/cgal into sloriot-Generator-more_point_generators-pmachado	2015-04-15 16:25:34 +02:00