Sébastien Loriot 7cabb0c508 Merge branch 'rebase/Mesh_2-add_optimizers-GF-old' into rebase/Mesh_2-add_optimizers-GF ... Conflicts: GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.cpp GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.ui Triangulation_2/include/CGAL/Constrained_Delaunay_triangulation_2.h		2015-05-19 09:01:20 +02:00
..
demo	Merge branch 'rebase/Mesh_2-add_optimizers-GF-old' into rebase/Mesh_2-add_optimizers-GF	2015-05-19 09:01:20 +02:00
doc/GraphicsView	fix links to Qt and escape some links	2015-02-23 13:20:05 +01:00
include/CGAL	Merge branch 'rebase/Mesh_2-add_optimizers-GF-old' into rebase/Mesh_2-add_optimizers-GF	2015-05-19 09:01:20 +02:00
package_info/GraphicsView	New license.txt files (eol changes)	2013-02-19 16:46:39 +01:00
src/CGAL_Qt4	changes after Efi's review (and color changes in the demo)	2014-11-10 18:00:02 +01:00
GraphicsView.odp	…
TODO	Convert all CRLF files to LF	2012-12-03 18:44:24 +01:00
dont_submit	Put doc/ in the global dont_submit file	2013-08-20 10:57:03 +02:00