fecfd711a7
Finishing merge
...
- Forgot one file with conflicts
2015-10-09 14:11:42 +02:00
1c0c2c8858
Merge branch 'CGAL_Polyhedron_Doxygen_GF-old' into CGAL_Polyhedron_Doxygen_GF
...
Conflicts:
Documentation/doc/Documentation/Doxyfile.in
Documentation/doc/Documentation/dependencies
Polyhedron/demo/Polyhedron/Camera_positions_list.cpp
Polyhedron/demo/Polyhedron/MainWindow.cpp
Polyhedron/demo/Polyhedron/MainWindow.h
Polyhedron/demo/Polyhedron/Polyhedron_demo_camera_positions_plugin.cpp
Polyhedron/demo/Polyhedron/Polyhedron_demo_normal_estimation_plugin.cpp
Polyhedron/demo/Polyhedron/Polyhedron_demo_off_plugin.cpp
Polyhedron/demo/Polyhedron/Polyhedron_demo_plugin_helper.cpp
Polyhedron/demo/Polyhedron/Polyhedron_demo_point_set_average_spacing_plugin.cpp
Polyhedron/demo/Polyhedron/Polyhedron_demo_point_set_bilateral_smoothing_plugin.cpp
Polyhedron/demo/Polyhedron/Polyhedron_demo_point_set_simplification_plugin.cpp
Polyhedron/demo/Polyhedron/Polyhedron_demo_point_set_smoothing_plugin.cpp
Polyhedron/demo/Polyhedron/Polyhedron_demo_point_set_upsampling_plugin.cpp
Polyhedron/demo/Polyhedron/Polyhedron_demo_point_set_wlop_plugin.cpp
Polyhedron/demo/Polyhedron/Scene.h
Polyhedron/demo/Polyhedron/Scene_item.h
Polyhedron/demo/Polyhedron/Scene_polylines_item.h
Polyhedron/demo/Polyhedron/Viewer.h
2015-10-09 13:59:33 +02:00
da650cbd1c
Merge branch 'old/CGAL-Solver-packages-GF' into CGAL-Solver-package-GF
2015-09-26 15:47:54 +02:00
d264b882f5
Package Three creation
...
- Creatio of a new package containing the base class for the plugin API.
2015-09-23 13:40:30 +02:00
36723443a4
Merge branch 'CGAL-Solver-package-GF-old' into CGAL-Solver-package-GF
2015-09-23 10:29:14 +02:00
cdfc7f1c31
Merge branch 'old/CGAL-split_packages-GF' into CGAL-split_packages-GF
2015-09-23 10:08:41 +02:00
3d3469524f
Merge branch 'CGAL-Solver-package-GF-old' into CGAL-Solver-package-GF
2015-09-22 12:07:50 +02:00
b970fc80ef
Merge branch 'old/Surface_reconstruction_points_3-Change_package_name-GF' into Surface_reconstruction_points_3-Change_package_name-GF
2015-09-22 09:54:18 +02:00
68aa21292a
Merge branch 'old/CGAL-Solver-packages-GF' into CGAL-Solver-package-GF
2015-09-21 07:34:18 +02:00
e91f342b31
generate IMAGE_PATH and dependencies for the Documentation package
...
the generation is done using the file packages.txt
2015-09-12 16:41:25 +02:00
470e96e75c
document msvc2015 support
2015-09-11 10:42:57 +02:00
e0646e3ebb
update old manual url
2015-09-10 14:03:45 +02:00
6692f993ce
Add/Remove some cgalPkgDependsOn
...
Move Visibility package from Arrangements to Polygons
Add some `` in the Visibility package
Add the keyword 'Geodesic' to the Shortest Path package.
2015-09-09 12:09:57 +02:00
e4c990f16d
Remove references to Lapack in doc and examples
2015-09-07 12:18:19 +02:00
63f77a05a5
Merge branch 'CGAL-Solver-package-GF-old' into CGAL-Solver-package-GF
2015-09-07 10:01:12 +02:00
d9d94f082e
Update files with new package name (Poisson_surface_reconstruction_3)
2015-09-04 18:18:52 +02:00
09f3659353
Improving doc
2015-09-02 15:40:30 +02:00
8a46d3cd5e
Include Lapack svd in Solver interface (another model for SvdTraits)
2015-08-26 14:49:27 +02:00
af8e73750c
Merge branch 'CGAL-Solver-package-GF-old' into CGAL-Solver-package-GF
2015-08-20 11:51:34 +02:00
67d72675fe
split packages
2015-08-17 23:46:59 +02:00
999c123be1
document use of qcollectiongenerator and sqlite plugin driver
2015-08-07 14:47:00 +02:00
578d846bf3
Update Chapter_checks.txt
...
fix a few typos
2015-07-31 13:31:26 +02:00
1613066935
Documentation CGAL_assume in the dev manual
2015-07-30 13:14:14 +02:00
9718bf7071
Merge pull request #206 from sloriot/Doc-add_clang_support
...
Fix versions of support compilers
2015-07-29 11:10:19 +02:00
dd0acaab3f
Fix the versions of g++ and Intel Compiler that are supported
2015-07-29 10:40:56 +02:00
6d96dcf268
document the list of qt5 modules used
2015-07-28 18:21:38 +02:00
b8f3d72a10
add note about versions of clang compiler supported
...
this is according to the compiler in the testsuite
2015-07-28 17:54:11 +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
6b15ec643c
Merge branch 'CGAL-Qt5_support-GF' into cgal-public-dev/Polygon_mesh_processing-GF
...
Conflicts:
Mesh_3/demo/Mesh_3/include/CGAL/gl_render.h
Polyhedron/demo/Polyhedron/CMakeLists.txt
Polyhedron/demo/Polyhedron/GlSplat/GlSplat.cpp
Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp
Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.h
2015-07-16 16:52:53 +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
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
15c1469a54
CGAL requires CMake>=2.8.11.
2015-07-10 17:01:42 +02:00
d70b65e431
Merge branch 'gsoc2013-Visibility_doc-hemmer'
...
PR 145
2015-07-10 15:25:39 +02:00
0c97a4e39c
update installation instruction for configuring Qt5
2015-07-10 10:23:15 +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
85f6b81666
move position of the package in the overview
2015-07-09 10:43:44 +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
d3b8bcee72
remove mentions of QT4 in the installation doc
2015-07-07 18:05:52 +02:00
ba1ebb0e3d
add empty line
2015-07-07 13:01:39 +02:00
43a45d933c
move line to ease merge
2015-07-07 12:59:59 +02:00
49c2cdc19a
Merge branch 'master' into sdglinf-philaris
...
Conflicts:
Installation/changes.html
2015-07-06 18:33:08 +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
30c11bd32d
rename package Mean_curvature_skeleton -> Surface_mesh_skeletonization
2015-07-03 16:05:56 +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
b4595e8802
remove empty line
2015-07-02 12:57:17 +02:00
e076bc179c
move lines to facilitate merge
2015-07-02 12:48:34 +02:00
Maxime Gimeno
Sébastien Loriot
Simon Giraudot
Andreas Fabri
Monique Teillaud
Laurent Rineau
Michael Hemmer