Sébastien Loriot d123ce5a47 Merge branch 'old/gsoc2014-Polyhedron_shortest_path-skiazyk' into gsoc2014-Polyhedron_shortest_path-skiazyk ... Conflicts: Documentation/biblio/geom.bib Documentation/doc/Documentation/Doxyfile.in Documentation/doc/Documentation/dependencies Documentation/doc/Documentation/packages.txt Documentation/scripts/generate_how_to_cite.py Polyhedron/demo/Polyhedron/CMakeLists.txt		2015-06-01 17:47:31 +02:00
..
Surface_mesh_segmentation	Merge branch 'old/gsoc2014-Polyhedron_shortest_path-skiazyk' into gsoc2014-Polyhedron_shortest_path-skiazyk	2015-06-01 17:47:31 +02:00