Sébastien Loriot 6b15ec643c Merge branch 'CGAL-Qt5_support-GF' into cgal-public-dev/Polygon_mesh_processing-GF ... Conflicts: Mesh_3/demo/Mesh_3/include/CGAL/gl_render.h Polyhedron/demo/Polyhedron/CMakeLists.txt Polyhedron/demo/Polyhedron/GlSplat/GlSplat.cpp Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.h		2015-07-16 16:52:53 +02:00
..
Surface_mesh_simplification	Merge branch 'CGAL-Qt5_support-GF' into cgal-public-dev/Polygon_mesh_processing-GF	2015-07-16 16:52:53 +02:00