Sébastien Loriot bbfddeb0d9 Merge branch 'Polyhedron_HoleFilling-GF-old' into Polyhedron_HoleFilling-GF ...

Conflicts:
	Documentation/doc/Documentation/dependencies
	Documentation/doc/Documentation/packages.txt
	Polyhedron/demo/Polyhedron/CMakeLists.txt
	Polyhedron/demo/Polyhedron/Polyhedron_demo_selection_plugin.cpp
	Polyhedron/demo/Polyhedron/Scene.cpp
	Polyhedron/demo/Polyhedron/Scene_polyhedron_item_decorator.h
	Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.h
	Solver_interface/include/CGAL/Eigen_solver_traits.h

2014-08-12 07:11:07 +02:00

..

include/CGAL

Merge branch 'Polyhedron_HoleFilling-GF-old' into Polyhedron_HoleFilling-GF

2014-08-12 07:11:07 +02:00

package_info/Solver_interface

New license.txt files (eol changes)

2013-02-19 16:46:39 +01:00