4f593d5d96
add info on how to help cmake find qt5
2015-07-17 17:12:00 +02:00
b43c8f4df6
remove comments
2015-07-17 17:04:32 +02:00
af341e4c23
Update requirement for Qt5: Debian-stable has 5.3.2
2015-07-17 16:05:12 +02:00
5de30629bc
Polish changes.html
2015-07-17 15:58:33 +02:00
08666dce25
Merge pull request #179 from afabri/CGAL-add_hash-GF
...
Add boost::hash and std::hash
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/hash
Conflicts:
Installation/changes.html
2015-07-17 15:39:18 +02:00
5d2c892dbe
Merge pull request #149 'lrineau/Polygon_mesh_processing-GF'
...
Add various functions to manipulate polygon meshes
2015-07-17 14:50:56 +02:00
2668d83d4e
Merge pull request #150 from 'cjamin/Point_set_shape_detection_3-cjamin'
...
Add an algorithm to fit geometric primitives on a point set
Conflicts:
Installation/changes.html
Polyhedron/demo/Polyhedron/CMakeLists.txt
2015-07-17 14:32:09 +02:00
aa72eaa371
Merge pull request #154 from maxGimeno/CGAL-Qt5_support-GF
...
Qt5 support, GSoC 2014
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Qt5_support
In this commit, I have fixed the permissions of the file:
Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/data/points
In this commit, I have also modified:
Installation/changes.html
2015-07-17 14:13:37 +02:00
5c58b6fe21
fix changes.html
2015-07-16 13:34:40 +02:00
c616df7196
Merge branch 'old/Polygon_mesh_processing-GF' into Polygon_mesh_processing-GF
...
Conflicts:
Documentation/biblio/cgal_manual.bib
Installation/changes.html
2015-07-13 08:16:59 +02:00
0fb169701f
Copy changes.html from master, to remove conflicts
2015-07-10 18:11:11 +02:00
f40fe0dc2d
Merge branch 'gsoc2013-Visibility_doc-hemmer' into CGAL-Qt5_support-GF
2015-07-10 18:07:26 +02:00
fa13f4ed0c
Merge remote-tracking branch 'philaris/sdglinf-philaris' into CGAL-Qt5_support-GF
2015-07-10 17:28:07 +02:00
b043876c68
Merge pull request #147 from philaris/sdglinf-philaris
...
L Infinity Segment Delaunay Graphs, new package
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Segment_Delaunay_graph_Linf_2
2015-07-10 17:26:42 +02:00
d70b65e431
Merge branch 'gsoc2013-Visibility_doc-hemmer'
...
PR 145
2015-07-10 15:25:39 +02:00
9ce70faffb
Merge branch 'gsoc13-CurveSkeleton-new_package-xgao' into CGAL-Qt5_support-GF
...
Conflicts:
Polyhedron/demo/Polyhedron/CMakeLists.txt
There was also a "conceptual conflict" in:
Polyhedron/demo/Polyhedron/Polyhedron_demo_mean_curvature_flow_skeleton_plugin.cpp
-> Adapt the declaration of the plugin to the Qt5 way.
2015-07-09 18:04:09 +02:00
e7563d3e05
Merge branch 'gsoc13-CurveSkeleton-new_package-xgao'
...
Conflicts:
Installation/changes.html
2015-07-09 17:30:24 +02:00
43de56ba21
Merge pull request #167 from afabri/AvoidMergeConflicts
...
Add place holders for the packages to be integrated
2015-07-09 10:33:23 +02:00
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
0401e17fc0
move to place holder
2015-07-07 16:46:32 +02:00
b2914e78d7
add empty line
2015-07-07 16:18:16 +02:00
7e041bcc50
move to place holder
2015-07-07 15:58:58 +02:00
c09f7e86ef
fix end of html comment
2015-07-07 14:59:36 +02:00
d26fdb17bf
Add place holders for the packages to be integrated
2015-07-07 13:37:47 +02:00
3b8c24a4df
Added the package
2015-07-07 12:06:46 +02:00
49c2cdc19a
Merge branch 'master' into sdglinf-philaris
...
Conflicts:
Installation/changes.html
2015-07-06 18:33:08 +02:00
e6ad9a82b3
Add a wrapper for the changes entry of sdglinf-philaris
2015-07-06 11:01:21 +02:00
05e0900b3e
update changes.html
2015-07-06 10:38:41 +02:00
253ec38a0a
Announce new functors for alpha-shapes
...
As asked in the last comment of https://github.com/CGAL/cgal/pull/84
2015-07-05 16:07:24 +02:00
5ac1311b01
updated announcement of new package sdg-linf
2015-07-03 17:32:45 +02:00
6484a56485
announce the new feature sdg-linf
2015-07-03 17:21:51 +02:00
a9fae2ea9b
update changes
2015-07-03 16:28:22 +02:00
c21c9dda35
Merge pull request #141 from afabri/Advancing_front_surface_reconstruction-afabri
...
Advancing Front Surface Reconstruction, new package
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Advancing_front_surface_reconstruction
2015-07-03 16:26:28 +02:00
bdd46e6978
Merge branch 'gsoc2013-Visibility_doc-hemmer-old' into gsoc2013-Visibility_doc-hemmer
...
Conflicts:
Documentation/biblio/cgal_manual.bib
Documentation/biblio/geom.bib
Installation/changes.html
2015-07-02 17:36:17 +02:00
c97f1e6d26
remove 2 empty lines
2015-07-02 12:55:46 +02:00
a900133057
move package in changes.html to avoid merge conflict
2015-07-02 12:52:54 +02:00
6dadd19bf6
add entry to changes.html
2015-07-01 18:21:16 +02:00
6b4acda559
Add Advancing Front Reconstruction to changes.html
2015-06-29 12:23:55 +02:00
76cf7e789f
Merge remote-tracking branch 'cgal/releases/CGAL-4.6-branch'
...
- Merge pull request #140 from
lrineau/Mesh_3-demo_fix_QGLViewer-2.6.0-lrineau
Fix for libQGLViewer>=2.6.0
Conflicts:
Installation/changes.html
2015-06-28 18:25:04 +02:00
b4875fc99a
changes for CGAL-4.6.1
2015-06-25 14:58:30 +02:00
de7db3ca68
Merge pull request #111 from aympelle/Periodic_3_Delaunay_triangulation_traits_3-APelle
...
- Rename `Periodic_3_triangulation_traits_3` to `Periodic_3_Delaunay_triangulation_traits_3`.
- Rename the concept `Periodic_3TriangulationTraits_3` to `Periodic_3DelaunayTriangulationTraits_3`.
- Create `Periodic_3_triangulation_traits_3`.
- Create the concept `Periodic_3TriangulationTraits_3`.
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/rename_p3tt3_p3dtt3
2015-06-17 09:59:33 +02:00
cce0d3ec64
Merge pull request #100 from sloriot/gsoc2014-Polyhedron_shortest_path-skiazyk
...
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Polyhedron_shortest_path
This package provides methods to compute the surface-constrained shortest path on 3d models. It was written as a project during GSoC 2014.
2015-06-15 10:45:25 +02:00
71207cac07
Merge pull request #116 from sloriot/gsoc2014-VCM_3-jmeyron
...
GSoC 2014, VCM feature from Jocelyn Meyron, Sébastien Loriot, and Quentin Mérigot
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/vcm_computation_and_applications
2015-06-15 10:37:29 +02:00
447c5fd2af
Merge pull request #69 from efifogel/MS_2-of_holes-efif
...
Add in `Minvoski_sum_2`:
- handling of polygons with holes,
- the new "reduced convolution" implementation.
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Minkowski_sum_2_polygons_with_holes_and_RC
2015-06-10 12:24:00 +02:00
40c629a3b4
Merge pull request #90 from janetournois/Mesh_2-add_optimizers-GF
...
Add optimizer methods in Mesh_2
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/lloyd_optimize_mesh_2
2015-06-10 11:57:53 +02:00
0321e244b1
Merge branch 'Ridges_3-BGL-GF-old' into Ridges_3-BGL-GF
...
Conflicts:
Installation/changes.html
2015-06-08 14:36:15 +02:00
c2cd87865e
Merge branch 'old/gsoc2014-VCM_3-jmeyron' into gsoc2014-VCM_3-jmeyron
...
Conflicts:
Installation/changes.html
Point_set_processing_3/doc/Point_set_processing_3/PackageDescription.txt
Point_set_processing_3/doc/Point_set_processing_3/Point_set_processing_3.txt
Point_set_processing_3/doc/Point_set_processing_3/examples.txt
Point_set_processing_3/examples/Point_set_processing_3/CMakeLists.txt
Polyhedron/demo/Polyhedron/CMakeLists.txt
2015-06-04 11:27:56 +02:00
d123ce5a47
Merge branch 'old/gsoc2014-Polyhedron_shortest_path-skiazyk' into gsoc2014-Polyhedron_shortest_path-skiazyk
...
Conflicts:
Documentation/biblio/geom.bib
Documentation/doc/Documentation/Doxyfile.in
Documentation/doc/Documentation/dependencies
Documentation/doc/Documentation/packages.txt
Documentation/scripts/generate_how_to_cite.py
Polyhedron/demo/Polyhedron/CMakeLists.txt
2015-06-01 17:47:31 +02:00
ded08221ae
Update changes.html.
...
Rename Periodic_3_triangulation_traits_3
Periodic_3_Delaunay_triangulation_traits_3.
Rename the concept Periodic_3TriangulationTraits_3
Periodic_3DelaunayTriangulationTraits_3.
Create Periodic_3_triangulation_traits_3.
Create the concept Periodic_3TriangulationTraits_3.
2015-05-29 20:04:34 +02:00
35d0fe8f18
Merge remote-tracking branch 'cgal-dev/BGL-helpers-GF' into Ridges_3-BGL-GF
2015-05-27 18:16:11 +02:00
Sébastien Loriot
Laurent Rineau
Andreas Fabri
Sebastien Loriot
Clement Jamin
Marc Glisse
Sandeep Kumar Dey
Michael Hemmer
Jane Tournois
Aymeric PELLE