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
..
doc/BGL	Merge remote-tracking branch 'cgal-dev/Polygon_mesh_processing-GF' into Polygon_mesh_processing-GF	2015-07-01 17:25:13 +02:00
examples	add missing filename in test	2015-07-16 08:48:59 +02:00
include/CGAL	simplify bgl named parameters handling with boost < 1.51 and make PMP compatible	2015-07-16 16:01:21 +02:00
package_info/BGL	New license.txt files (eol changes)	2013-02-19 16:46:39 +01:00
test/BGL	Merge branch 'CGAL-Qt5_support-GF' into cgal-public-dev/Polygon_mesh_processing-GF	2015-07-16 16:52:53 +02:00
dont_submit	add todo	2015-07-16 10:25:09 +02:00