songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cgal/Installation/cmake
History
Maxime Gimeno ed3298ee2f Merge branch 'Polyhedron-new_opengl_REBASED_to_ignore_reindentations-gf' into CGAL-Qt5_support-GF 
Conflicts:
	Polyhedron/demo/Polyhedron/CMakeLists.txt
	Polyhedron/demo/Polyhedron/Polyhedron_demo_mesh_3_plugin.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_demo_mesh_3_plugin_cgal_code.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_demo_selection_plugin.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_demo_trivial_plugin.cpp
	Polyhedron/demo/Polyhedron/Scene.cpp
 		2015-04-27 08:50:06 +02:00
..
modules Merge branch 'Polyhedron-new_opengl_REBASED_to_ignore_reindentations-gf' into CGAL-Qt5_support-GF 2015-04-27 08:50:06 +02:00