278a28016a
Merge branch 'CGAL-Qt5_support-GF'
...
Fixes #265 , fixes #254 .
2015-08-27 16:37:37 +02:00
5688134b64
do not generate latex doc by default
2015-08-07 16:53:34 +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
ccb823f71d
remove unused references
2015-07-09 17:26:59 +02:00
ef02b42c4f
add missing }
2015-07-09 14:00:53 +02:00
85f6b81666
move position of the package in the overview
2015-07-09 10:43:44 +02:00
5489927234
remove merge conflict markers
2015-07-09 10:38:41 +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
9087f863a4
fix previous commit
2015-07-01 17:40:57 +02:00
4c841d73e8
fix previous commit
2015-07-01 17:38:37 +02:00
bec3370540
avoid merge conflicts by moving lines
2015-07-01 17:03:13 +02:00
20c1b1a1f6
Merge branch 'Polygon_mesh_processing-GF-old' into Polygon_mesh_processing-GF
...
Conflicts:
BGL/include/CGAL/boost/graph/Euler_operations.h
BGL/include/CGAL/boost/graph/iterator.h
Documentation/doc/Documentation/Doxyfile.in
Documentation/doc/Documentation/dependencies
Polyhedron/demo/Polyhedron/Polyhedron_demo_point_inside_polyhedron_plugin.cpp
Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp
Polyhedron/demo/Polyhedron/Selection_widget.ui
2015-07-01 13:52:44 +02:00
3fac8e761a
Merge branch 'Point_set_shape_detection_3-cjamin-old' into Point_set_shape_detection_3-cjamin
2015-06-30 10:36:11 +02:00
04f3bc1454
SDG Linf doc: add fig dir for list of packages
2015-06-30 10:32:05 +02:00
aa5545c8b4
add SDG Linf to packages.txt
2015-06-30 10:32:04 +02:00
5bed853f3e
correct year in CDGP ICMS 2014 reference
2015-06-30 10:32:04 +02:00
e217500791
SDG Linf ICMS 2014 paper in bibliography
2015-06-30 10:32:03 +02:00
1cca9420ce
capitalize Voronoi in Papadopoulou-Lee article
2015-06-30 10:32:03 +02:00
d7b97365fd
capitalize L in Linf bibliography entry
2015-06-30 10:31:59 +02:00
9692d2bc1c
Papadopoulou and Lee article on SVD Linf
2015-06-30 10:31:58 +02:00
55b77d06de
add SDG Linf in doc dependencies
2015-06-30 10:31:58 +02:00
a0e7a60973
Merge remote-tracking branch 'cgal/master' into CGAL-Qt5_support-GF
...
Conflicts:
Alpha_shapes_3/demo/Alpha_shapes_3/CMakeLists.txt
Alpha_shapes_3/demo/Alpha_shapes_3/MainWindow.cpp
Alpha_shapes_3/demo/Alpha_shapes_3/Viewer.h
GraphicsView/demo/Alpha_shapes_2/CMakeLists.txt
GraphicsView/demo/Apollonius_graph_2/CMakeLists.txt
GraphicsView/demo/Bounding_volumes/CMakeLists.txt
GraphicsView/demo/Circular_kernel_2/CMakeLists.txt
GraphicsView/demo/Generator/CMakeLists.txt
GraphicsView/demo/GraphicsView/CMakeLists.txt
GraphicsView/demo/L1_Voronoi_diagram_2/CMakeLists.txt
GraphicsView/demo/Largest_empty_rect_2/CMakeLists.txt
GraphicsView/demo/Periodic_2_triangulation_2/CMakeLists.txt
GraphicsView/demo/Segment_Delaunay_graph_2/CMakeLists.txt
GraphicsView/demo/Snap_rounding_2/CMakeLists.txt
GraphicsView/demo/Spatial_searching_2/CMakeLists.txt
GraphicsView/demo/Stream_lines_2/CMakeLists.txt
GraphicsView/demo/Triangulation_2/CMakeLists.txt
Linear_cell_complex/demo/Linear_cell_complex/CMakeLists.txt
Mesh_3/demo/Mesh_3/CMakeLists.txt
Mesh_3/demo/Mesh_3/include/CGAL_demo/Scene_item_with_display_list.h
Mesh_3/demo/Mesh_3/src/CGAL_demo/Scene.cpp
Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/CMakeLists.txt
Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/Scene.cpp
Polyhedron/demo/Polyhedron/CMakeLists.txt
Polyhedron/demo/Polyhedron/Polyhedron_demo_join_and_split_polyhedra_plugin.cpp
Polyhedron/demo/Polyhedron/Polyhedron_demo_mesh_3_plugin.cpp
Polyhedron/demo/Polyhedron/Polyhedron_demo_trivial_plugin.cpp
Polyhedron/demo/Polyhedron/Scene.cpp
Polyhedron/demo/Polyhedron/Scene_combinatorial_map_item.h
Polyhedron/demo/Polyhedron/Scene_implicit_function_item.h
Polyhedron/demo/Polyhedron/Scene_plane_item.h
Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp
Polyhedron/demo/Polyhedron/Scene_polyhedron_item.cpp
Polyhedron/demo/Polyhedron/Scene_polyhedron_item.h
Polyhedron/demo/Polyhedron/Scene_polyhedron_transform_item.h
Polyhedron/demo/Polyhedron/Scene_polylines_item.h
Polyline_simplification_2/demo/Polyline_simplification_2/CMakeLists.txt
Surface_mesher/demo/Surface_mesher/CMakeLists.txt
Triangulation_3/demo/Triangulation_3/CMakeLists.txt
Triangulation_3/demo/Triangulation_3/MainWindow.cpp
2015-06-30 09:17:26 +02:00
7792a8fa15
Merge branch 'old/gsoc13-CurveSkeleton-new_package-xgao' into gsoc13-CurveSkeleton-new_package-xgao
...
Conflicts:
Documentation/doc/Documentation/Doxyfile.in
Polyhedron/demo/Polyhedron/cgal_test_with_cmake
2015-06-29 23:16:37 +02:00
Laurent Rineau
Sébastien Loriot
Monique Teillaud
Andreas Fabri
Michael Hemmer
Clement Jamin
Panagiotis Cheilaris
Maxime Gimeno