songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cgal/BGL/include/CGAL
History
Laurent Rineau 8be7c27063 Merge remote-tracking branch 'cgal-public-dev/CGAL-Qt5_support-GF' into CGAL-Qt5_support-GF 
...aka refresh the branch from 'master'.

Conflicts:
	AABB_tree/demo/AABB_tree/Scene.cpp
	Polyhedron/demo/Polyhedron/Scene_edit_polyhedron_item.cpp
 		2015-07-28 15:30:17 +02:00
..
boost/graph Merge remote-tracking branch 'cgal-public-dev/CGAL-Qt5_support-GF' into CGAL-Qt5_support-GF 2015-07-28 15:30:17 +02:00
HalfedgeDS_face_max_base_with_id.h change LGPLv2 -> LGPLv3 2011-10-10 13:48:25 +00:00
HalfedgeDS_halfedge_max_base_with_id.h change LGPLv2 -> LGPLv3 2011-10-10 13:48:25 +00:00
HalfedgeDS_vertex_max_base_with_id.h change LGPLv2 -> LGPLv3 2011-10-10 13:48:25 +00:00
Polyhedron_items_with_id_3.h change LGPLv2 -> LGPLv3 2011-10-10 13:48:25 +00:00
Triangulation_vertex_base_with_id_2.h change LGPLv2 -> LGPLv3 2011-10-10 13:48:25 +00:00