Andreas Fabri 6e36a853a9 Merge branch 'Surface_mesh-new_package-GF' ... Approved by the release manager Conflicts: Documentation/doc/Documentation/dependencies Documentation/resources/how_to_cite_cgal.bib.in Installation/changes.html		2015-01-12 11:27:35 +01:00
..
benchmark	Merge branch 'CGAL-various_fixes-lrineau'	2014-12-17 17:07:57 +01:00
doc/STL_Extension	Merge branch 'Surface_mesh-new_package-GF'	2015-01-12 11:27:35 +01:00
examples/STL_Extension	Merge branch 'Kernel-replace_object-pmoeller-old' into Kernel-replace_object-pmoeller	2013-03-14 10:29:31 +01:00
include/CGAL	Merge branch 'Surface_mesh-new_package-GF'	2015-01-12 11:27:35 +01:00
package_info/STL_Extension	New license.txt files (eol changes)	2013-02-19 16:46:39 +01:00
src/CGAL	Convert source files encoding to utf-8	2014-08-01 11:20:13 +02:00
test/STL_Extension	Merge branch 'Surface_mesh-new_package-GF'	2015-01-12 11:27:35 +01:00
dont_submit	Put doc/ in the global dont_submit file	2013-08-20 10:57:03 +02:00