Commit Graph

296 Commits

Author SHA1 Message Date
Sébastien Loriot b6f5088676 Merge branch 'Scale_space_reconstruction_3-tvanlank'
Tested in CGAL-4.6-Ic-104
   Approved by the release manager
2015-01-14 16:09:11 +01:00
Andreas Fabri 8929fd43c1 Merge branch 'Triangulation_2-NewPolylineConstraint-GF'
Approved by the release manager
Conflicts:
	Documentation/resources/how_to_cite_cgal.bib.in
2015-01-12 11:44:32 +01:00
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
Sébastien Loriot 2c961258cb update changes and bibtex file 2015-01-09 14:14:30 +01:00
Sébastien Loriot d2e0dca2f9 update changes 2015-01-09 12:36:07 +01:00
Sébastien Loriot 43e8fae5f8 cosmetic changes 2015-01-09 10:49:26 +01:00
Sébastien Loriot 0218954ea6 Merge branch 'barycentric_coordinates_2-dmitry'
Tested in CGAL-4.6-Ic-99 and CGAL-4.6-Ic-100
  Approved by the release manager

Conflicts:
	Installation/changes.html
	Kernel_23/include/CGAL/internal/Projection_traits_3.h
2015-01-09 10:35:20 +01:00
Clement Jamin e0b402b094 Merge branch 'Triangulation-higher_dimensions-odevil_shornus'
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Triangulation_d
Tested in CGAL-4.6-Ic-98
Approved by the release manager
2015-01-08 18:15:34 +01:00
Remy Thomasse 02ab5261bc Approved by the Release Manager
Merge branch 'Generators_convex-rthomass'
2015-01-08 15:46:24 +01:00
Sylvain Brandel 9a6ed32a15 Merge branch 'Combinatorial_map-update_attributes-sbrandel'
- corresponding to small feature "Combinatorial map update attributes"
   https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Combinatorial_map_update_attributes
- succesfully tested, release number CGAL-4.6-lc-99
- Approved by the Release Manager

Conflicts:
	Installation/changes.html
2015-01-08 14:48:47 +01:00
Sylvain Brandel 92681aae83 added changes in Installation/changes.html 2015-01-07 16:21:16 +01:00
Remy Thomasse f85647f666 changes.html 2015-01-06 17:04:30 +01:00
Dmitry Anisimov 8e4a486024 Updated file changes.html. 2014-12-29 16:40:15 +01:00
Dmitry Anisimov 7d9f7bcf9c Test update and modification of the file changes.html. 2014-12-29 16:16:30 +01:00
Andreas Fabri 476fadca6a Add Surface_mesh to changes.html 2014-12-22 18:05:42 +01:00
Laurent Rineau e6f1aaa801 Fix the HTML in changes.html 2014-12-22 16:50:03 +01:00
Andreas Fabri b85f97593a Add entry in changes.html 2014-12-19 14:43:08 +01:00
Clement Jamin 7a06a08ca4 Update doc to state that ICC prior to version 15 is not supported for Epick_d
Approved by the Release Manager
2014-12-18 12:42:34 +01:00
Clement Jamin 315ffdcbc8 Merge branch 'Triangulation-higher_dimensions-odevil_shornus-old' into Triangulation-higher_dimensions-odevil_shornus 2014-12-18 09:32:23 +01:00
Sébastien Loriot 79d2f2383c update changes 2014-12-16 11:52:59 +01:00
Sébastien Loriot 3972130053 update changes.html 2014-12-11 08:50:21 +01:00
Clement Jamin c6de2a50b2 Merge branch 'Triangulation-higher_dimensions-odevil_shornus-old' into Triangulation-higher_dimensions-odevil_shornus 2014-11-20 19:19:23 +01:00
Andreas Fabri 4b46c889e4 update changes.html 2014-11-10 10:42:20 +01:00
Laurent Rineau 7d63f9d072 Merge branch 'releases/CGAL-4.5-branch'
Conflicts:
	Installation/changes.html
	Maintenance/release_building/public_release_name
2014-11-06 10:47:45 +01:00
Laurent Rineau d85eaa327c Merge remote-tracking branch 'origin/Mesh_3-fix_exuder_holes_on_surface-GF' into releases/CGAL-4.5-branch
Bug-fix for Mesh_3:
  Fix a bug in the sliver exudation preservation of boundaries.

Approved by the Release Manager.
2014-10-31 11:32:09 +01:00
Jane Tournois df0ec2e54d mention exuder bug fix in changes.html 2014-10-21 11:29:07 +02:00
Laurent Rineau 908d608072 Merge branch 'releases/CGAL-4.5-branch'
Conflicts:
	Installation/changes.html
2014-10-20 14:46:36 +02:00
Laurent Rineau 8d61c8db07 Add comments (following the manual chapters) 2014-10-06 16:52:22 +02:00
Laurent Rineau f5d89b443e Update CHANGES 2014-10-06 16:46:28 +02:00
Sébastien Loriot aabd9dc557 update changes 2014-09-29 08:44:51 +02:00
Sébastien Loriot 377342b311 add backward compatibility class/doc/test 2014-09-23 11:34:47 +02:00
Clement Jamin 0040d62791 Update changes.html 2014-09-18 15:09:41 +02:00
Clement Jamin 8f259e5dea Merge branch 'Triangulation-higher_dimensions-odevil_shornus-old' into Triangulation-higher_dimensions-odevil_shornus 2014-09-09 11:20:33 +02:00
Laurent Rineau d4bdae3077 Prepare CGAL-4.5-beta1 2014-08-12 19:09:57 +02:00
Laurent Rineau 6cba91ac8f Recode changes.html to UTF-8.
And update CHANGES.
2014-08-01 14:12:55 +02:00
Laurent Rineau 3214507a45 Merge branch 'CGAL-fix_cmake_3-GF'
Add the compatibility with CMake 3.0, without using any new feature.

Tested in CGAL-4.5-Ic-104.

Approved by the Release Manager.
2014-08-01 14:11:02 +02:00
Sébastien Loriot 2b6fa0076a Merge branch 'BGL-fix_halfedge_edge_is_border_pmap-sloriot'
Tested in CGAL-4.5-Ic-105

Approved by the (interim) release manager
2014-07-24 20:41:06 +02:00
Sébastien Loriot cc36cf8359 Merge branch 'boost-work_around_dijktra_bug_1.54-local'
Distribute dijktra header file from boost 1.55 to work around
  a bug in the version 1.54. The header file is only used if the
  user compiles with boost 1.54

Tested in CGAL-4.5-Ic-102
Approved by the release manager

Conflicts:
	Installation/changes.html
2014-07-23 08:46:33 +02:00
Sébastien Loriot cdec3d6414 make the edge_descriptor of Polyhedron hashable 2014-07-23 08:20:16 +02:00
Sébastien Loriot 5c6b54257a the XXX_is_border properties are removed + add missing replacement functions 2014-07-22 12:00:15 +02:00
Sébastien Loriot 45f7298ce7 Merge branch 'Polyhedron_demo-import_splatting-GF'
Tested in CGAL-4.5-Ic-100
Approved by the release manager

Conflicts:
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/CMakeLists.txt
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_poisson_plugin.cpp
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_poisson_plugin_cgal_code.cpp
2014-07-21 08:23:36 +02:00
Sébastien Loriot bc8e1f399d workaround a bug in dijsktra algorithm in boost 1.54 affecting normal estimation 2014-07-19 12:20:29 +02:00
Clement Jamin fbf824c711 Merge branch 'Mesh_3-parallel-cjamin'
This branch introduces parallel algorithms in Triangulation_3 and Mesh_3,
as well as a Concurrent_compact_container. The corresponding features are:
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Parallel_triangulation_3
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Parallel_Mesh_3

Tested in CGAL-4.5-Ic-98.
Approved by the Release Manager.
2014-07-17 19:08:24 +02:00
Sébastien Loriot fce46e5164 document the removal of the surface reconstruction demo 2014-07-17 13:41:43 +02:00
Clement Jamin ca70dd0bde The parallel algorithms are experimental 2014-07-17 10:52:39 +02:00
Sébastien Loriot 16441b0f6d Merge branch 'Surface_modeling-integration_with_BGL-GF'
Introduces the Surface modeling package that allows
  to deform a triangulated surface mesh

Successfully tested in CGAL-4.5-Ic-90
Approved by the Release Manager

Conflicts:
	Installation/changes.html
2014-07-08 19:53:36 +02:00
Sébastien Loriot 2aadba50d7 Merge branch 'BGL-redesign_final-GF'
Introduces a redesign of the CGAL extension of the BGL API

Successfully tested in CGAL-4.5-Ic-90
Approved by the Release Manager

Conflicts:
	Surface_mesh_segmentation/test/Surface_mesh_segmentation/test_compute_sdf_values_and_segment_exact_rational.cpp
2014-07-08 19:45:16 +02:00
Andreas Fabri fd123ac130 cosmetic change 2014-07-04 14:54:10 +02:00
Sébastien Loriot 8cbca4f4b3 update changes.html 2014-07-04 13:55:42 +02:00
Sébastien Loriot c0c9c1c090 update changes.html 2014-07-04 11:29:25 +02:00