songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cgal/Triangulation_2
History
Laurent Rineau bbd6951161 Merge branch 'afabri/Advancing_front_surface_reconstruction-afabri' into CGAL-Qt5_support-GF 
Conflicts:
	Polyhedron/demo/Polyhedron/Scene_points_with_normal_item.cpp

There was also two "conceptual conflicts" that git-merge did not see,
in:
        Polyhedron/demo/Polyhedron/CMakeLists.txt
        Polyhedron/demo/Polyhedron/Polyhedron_demo_advancing_front_plugin.cpp

Polyhedron/demo/Polyhedron/CMakeLists.txt had to use qt5_wrap_ui instead
of qt4_wrap_ui (that lead to a CMake error), and the declaration of the plugin in
Polyhedron/demo/Polyhedron/Polyhedron_demo_advancing_front_plugin.cpp
was not using the Qt5 way (that lead to a compilation error)
 		2015-07-08 17:21:36 +02:00
..
benchmark/Triangulation_2 add a benchmark on insertion of points on constrained edges with EPEC 2013-07-24 13:07:22 +02:00
demo/Triangulation_2 cosmetic changes to remove mentions of QT4 2015-07-07 18:00:43 +02:00
doc Add the src files of figures of TDS_2 2015-01-28 13:19:12 +01:00
examples/Triangulation_2 rename example 2015-05-19 08:54:32 +02:00
include/CGAL Merge branch 'afabri/Advancing_front_surface_reconstruction-afabri' into CGAL-Qt5_support-GF 2015-07-08 17:21:36 +02:00
package_info/Triangulation_2 New license.txt files (eol changes) 2013-02-19 16:46:39 +01:00
test/Triangulation_2 Merge pull request #74 from lrineau/Triangulation_2-fix_projection_traits-GF 2015-06-10 12:30:29 +02:00
TODO
…
dont_submit Put doc/ in the global dont_submit file 2013-08-20 10:57:03 +02:00