Andreas Fabri
|
20c1b1a1f6
|
Merge branch 'Polygon_mesh_processing-GF-old' into Polygon_mesh_processing-GF
Conflicts:
BGL/include/CGAL/boost/graph/Euler_operations.h
BGL/include/CGAL/boost/graph/iterator.h
Documentation/doc/Documentation/Doxyfile.in
Documentation/doc/Documentation/dependencies
Polyhedron/demo/Polyhedron/Polyhedron_demo_point_inside_polyhedron_plugin.cpp
Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp
Polyhedron/demo/Polyhedron/Selection_widget.ui
|
2015-07-01 13:52:44 +02:00 |
|