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
..
demo/Polyhedron_IO	CGAL requires CMake>=2.8.11.	2015-07-10 17:01:42 +02:00
examples/Polyhedron_IO	move stl2off.cpp to test as it uses an undocumented function	2015-06-05 16:33:53 +02:00
include/CGAL/IO	Merge branch 'Polygon_mesh_processing-GF-old' into Polygon_mesh_processing-GF	2015-07-01 13:52:44 +02:00
package_info/Polyhedron_IO	New license.txt files (eol changes)	2013-02-19 16:46:39 +01:00
test/Polyhedron_IO	Merge two commits forgotten in pull-request #110	2015-06-17 10:20:28 +02:00