songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
80,417 Commits 3 Branches 156 Tags 966 MiB
Commit Graph

648 Commits

Author SHA1 Message Date
Sébastien Loriot 388c68dcc3 move resource files in a directory with the doxygen version it was generated for 2016-12-29 15:18:00 +01:00
Sébastien Loriot 8ec61532ff follow up of #900 2016-12-29 13:44:27 +01:00
Sébastien Loriot 29b28949e9 cite metro 2016-12-29 07:21:04 +01:00
Sébastien Loriot cad6cbbcf4 fix doc issues detected by recent doxygen 
duplicated labels, missing bibtex entry and nested comments
 2016-12-28 13:59:45 +01:00
Simon Giraudot fb9aae74c6 Merge branch 'Point_set_processing-Automatic_scale_selection-GF-old' into Point_set_processing-Automatic_scale_selection-GF 2016-12-21 13:06:36 +01:00
Sébastien Loriot 7868adbe81 catch more errors and warnings 2016-12-06 15:15:24 +01:00
Guillaume Damiand cfb7547d6f Add new GMap package in packages.txt 2016-11-29 11:43:16 +01:00
Guillaume Damiand 7bb252021e Add the new GMap package in the list of packages. 2016-11-29 11:43:15 +01:00
Guillaume Damiand a080eed927 Add the reference for the book on combinatorial maps. 2016-11-29 11:43:15 +01:00
Simon Giraudot 310d81864e Merge branch 'Classification-GF-old' into Classification-GF 2016-11-23 08:55:57 +01:00
Simon Giraudot 31278c59cb Change package name, namespaces, etc. 2016-11-03 10:05:45 +01:00
Simon Giraudot 6f6e923df4 Add references to doc 2016-11-02 15:04:11 +01:00
Simon Giraudot f65db046b1 Merge branch 'Point_set_processing_3-Point_set_structuring-GF-old' into Point_set_processing_3-Point_set_structuring-GF 2016-10-28 15:02:48 +02:00
Simon Giraudot 22f0b2c1f8 Merge branch 'Point_set_3-GF-old' into Point_set_3-GF 2016-10-24 15:17:38 +02:00
Laurent Rineau c038bff9b7 Merge pull request #1359 from lrineau/Documentation-deprecate_CGAL_VERSION-lrineau 
Deprecate the macro CGAL_VERSION
 2016-10-05 13:03:16 +02:00
Simon Giraudot ca08b10244 Merge branch 'Point_set_3-GF' into Point_set_classification-GF 2016-09-30 11:56:10 +02:00
Simon Giraudot 7b858777c1 Merge branch 'Point_set_3-GF-old' into Point_set_3-GF 2016-09-30 08:22:58 +02:00
Andreas Fabri f53c436a80 Undo accidental edit 2016-09-29 15:10:28 +02:00
Andreas Fabri b558a31b71 Update cgal_manual.bib 
fix an url
 2016-09-29 14:15:29 +02:00
Simon Giraudot 65910da1a6 Merge branch 'Point_set_3-GF-old' into Point_set_3-GF 2016-09-28 11:25:36 +02:00
Simon Giraudot ee4f06f13a Merge branch 'Point_set_classification-GF-old' into Point_set_classification-GF 2016-09-28 11:17:39 +02:00
Simon Giraudot 3a356505c8 Merge branch 'Point_set_3-GF' into Point_set_classification-GF 2016-09-21 09:42:41 +02:00
Simon Giraudot adbc4862de Add files and dependencies for new package manual 2016-09-14 17:52:53 +02:00
Sébastien Loriot 2ee55c4560 allow building the doc without configuring CGAL 2016-09-10 00:04:20 +02:00
Clement Jamin fa6ecf39be Merge branch 'Triangulation-add_regular_tri-cjamin_mglisse-old' into Triangulation-add_regular_tri-cjamin_mglisse 2016-09-09 12:55:43 +02:00
Clement Jamin 6102307e86 Add reference to paper 2016-09-07 16:56:54 +02:00
Laurent Rineau 514f611649 Deprecate the macro CGAL_VERSION 2016-08-23 16:32:47 +02:00
Simon Giraudot fee10522bb Add biblio reference 2016-08-10 17:29:53 +02:00
Simon Giraudot 7192f58c8e Merge branch 'Point_set_classification-GF-old' into Point_set_classification-GF 2016-07-19 14:50:55 +02:00
Simon Giraudot 9fa12bf982 Merge branch 'Point_set_processing_3-Point_set_structuring-GF-old' into Point_set_processing_3-Point_set_structuring-GF 2016-07-19 14:50:15 +02:00
Laurent Rineau cff8767433 Fix a typo 
No 'S' in `CGAL_HEADER_ONLY`.
 2016-07-11 10:46:12 +02:00
Simon Giraudot df54266b70 Begin working on documentation of data classification 2016-07-08 09:05:38 +02:00
Laurent Rineau 5ebfefe72c Merge pull request #894 from gdamiand/CGAL_headers_only_step1-gdamiand_cjamin 
CGAL header-only: step 1

(I actually do this merge for the Github interface for mobile phones! How much does that add to my geek-value?)
 2016-07-05 19:50:36 +02:00
Sebastien Loriot 2d0e402e5b Merge pull request #1195 from sloriot/SMD-add_sre_arap 
Add Smoothed Rotation Enhanced As-Rigid-As-Possible
 2016-07-05 16:25:17 +02:00
Sébastien Loriot a653b5cc40 add SRE_ARAP in the user manual 2016-07-05 16:20:42 +02:00
Simon Giraudot 08b0711ee4 Merge branch 'Point_set_processing_3-Point_set_structuring-GF-old' into Point_set_processing_3-Point_set_structuring-GF 2016-07-05 14:16:54 +02:00
Clement Jamin 3f130026bd Typos 2016-06-29 14:55:39 +02:00
Clement Jamin c42419a63a Document minimum CMake version + replace 4.X by 4.9 2016-06-29 14:35:59 +02:00
Sébastien Loriot 10cadcb985 Merge remote-tracking branch 'cgal-dev/CGAL_headers_only_step1-gdamiand_cjamin' into HEAD 2016-06-24 17:05:40 +02:00
Sébastien Loriot bbf007c41f fix doc typos 2016-06-22 21:54:43 +02:00
Guillaume Damiand a53f16edac Merge branch 'CGAL_headers_only_step1-gdamiand_cjamin-old' into CGAL_headers_only_step1-gdamiand_cjamin 2016-06-09 19:09:38 +02:00
Sebastien Loriot b13b098d3b Merge pull request #1066 from ws4u/Cone_spanners_2-new_package-UWS 
Cone spanners 2 new package uws
 2016-06-08 14:49:13 +02:00
Guillaume Damiand 10469f9c4e Update with master 2016-05-25 10:58:55 +02:00
Simon Giraudot a6b11751b1 Merge branch 'Point_set_processing_3-Point_set_structuring-GF-old' into Point_set_processing_3-Point_set_structuring-GF 2016-05-17 10:00:03 +02:00
Sebastien Loriot 54b244c430 Merge pull request #914 from sgiraudot/Point_set_shape_detection_3-Plane_regularization-GF 
Point set shape detection: Plane regularization
 2016-04-29 13:08:44 +02:00
Andreas Fabri 79b0257e59 Merge branch 'Cone_spanners_2-new_package-UWS-old' into Cone_spanners_2-new_package-UWS 2016-04-26 09:01:56 +02:00
Simon Giraudot 372b2d161a Merge branch 'Point_set_processing_3-Point_set_structuring-GF-old-old' into Point_set_processing_3-Point_set_structuring-GF-old 2016-04-12 14:01:45 +02:00
Guillaume Damiand 22d275a0fa Update section '7.3 Header only option' following Laurent remarks. 2016-03-23 17:31:17 +01:00
Laurent Rineau 5b0f00df33 Merge pull request #900 from sgiraudot/CGAL_Tutorials 
CGAL Manual: Tutorials
 2016-03-22 11:02:34 +01:00
Guillaume Damiand 165f80b59c Update documentation to add section 7.3 Header only option 2016-03-16 16:28:31 +01:00
Simon Giraudot 7276c06c36 Merge branch 'Point_set_shape_detection_3-Plane_regularization-GF-old' into Point_set_shape_detection_3-Plane_regularization-GF 2016-03-15 10:37:02 +01:00
Simon Giraudot b9606f5d6c Some text corrections in Hello World 2016-03-10 16:31:50 +01:00
Simon Giraudot cec789483d Reference tutorial page in sidebar menu and header menu 2016-03-10 16:14:37 +01:00
Simon Giraudot b9d9db321c Add new page to manual: Tutorials 2016-03-10 16:13:49 +01:00
Simon Giraudot 3b840a2c04 Change tag of page Hello World 2016-03-10 16:13:27 +01:00
Simon Giraudot b83659fa87 Remove reference to Hello World from Getting_started 2016-03-10 16:12:57 +01:00
Simon Giraudot 64a212eb29 Move Hello World to tutorials 2016-03-10 16:12:34 +01:00
Sébastien Loriot c82ceaf435 improve description about boost libs allowed to be used 2016-03-10 11:21:10 +01:00
Sebastien Loriot fdb824c2aa Merge pull request #804 from sgiraudot/2D_Reconstruction-Rename_package-GF 
2D reconstruction: rename package
 2016-02-29 10:24:36 +01:00
Monique Teillaud 0f9bfa672a update instllation.txt 
add demos into ideal setting
 2016-02-26 14:09:38 +01:00
Simon Giraudot aeaf85f35f Update name in general documentation files 2016-02-19 09:21:06 +01:00
Philipp Möller 78588cc3c0 Fixes #779 2016-02-16 17:12:07 +01:00
Philipp Möller 0a04a3a48f Use CGAL_DOC_VERSION 2016-02-11 15:37:54 +01:00
Philipp Möller 3b63763f5d Introduce CGAL_DOC_VERSION 2016-02-11 15:37:20 +01:00
Sébastien Loriot 2ed0fc0fdf Merge pull request #151 from cjamin/gsoc2014-2d-reconstruction-ivovigan 
2D Reconstruction Simplification, new package, GSoC 2014
 2016-02-09 19:42:32 +01:00
Sebastien Loriot e7f627c08a Merge pull request #750 from sloriot/Three-exclude_from_official_doc 
Three: remove from the official doc
 2016-02-09 10:18:54 +01:00
Clement Jamin fd32d475d5 Change category 2016-02-08 17:32:17 +01:00
Sébastien Loriot eb2ba8cefe rename Surface_modeling package to Surface_mesh_deformation for consistency 2016-02-08 12:25:49 +01:00
Sébastien Loriot 79743f96d9 remove Three from the official doc 2016-02-08 11:42:43 +01:00
Sébastien Loriot 06c304c614 fix doc warnings spotted by doxygen 1.8.11 
Tested locally
 2016-02-04 22:23:48 +01:00
Sébastien Loriot 72863bfe44 fix doxygen warnings 2016-02-04 21:19:36 +01:00
Andreas Fabri 3aa6b5b626 Do not document EIGEN3_DIR as it is identical to EIGEN3_INC_DIR 2016-02-02 14:54:59 +01:00
Sébastien Loriot 16787cd275 force setting of cmake CGAL_BGL_EXAMPLE_DIR for the doc build in flat mode 2016-01-22 09:46:25 +01:00
Sébastien Loriot dfe6449804 detect BGL as a package with examples so that its variable is set (branch build) 2016-01-22 09:36:56 +01:00
Sebastien Loriot 674425ef5f Merge pull request #598 from bo0ts/Maintenance-run_doxygen_from_release-pmoeller 
Use the ability to build doc from a release
 2016-01-22 09:17:57 +01:00
Philipp Möller 15a8db17b8 Fix detection of subpackages 
This needs to account for the fact that there might be unknown
non-package directories in a release doc folder.
 2016-01-21 16:42:39 +01:00
Sébastien Loriot df741e6cd5 remove extra comment symbols in doc 2016-01-19 13:28:17 +01:00
Simon Giraudot 98b2ab832f Merge branch 'Point_set_processing_3-Point_set_structuring-GF-old' into Point_set_processing_3-Point_set_structuring-GF 2016-01-19 12:41:01 +01:00
Sebastien Loriot 8a8ba80f11 Merge pull request #504 from sloriot/Dev_man-how_to_run_testsuite 
add a page on how to run the testsuite
 2016-01-18 09:43:41 +01:00
Monique Teillaud 2fea076e9f add missing url 2016-01-17 20:03:29 +01:00
Monique Teillaud 617959a633 updated reference on perturbations 
(I kept the same bibtex label so that citations of the old version of the paper automatically cite the new one)
 2016-01-17 20:03:28 +01:00
Monique Teillaud 9f1f87b24d Revert "update using "doxygen -u"" (let's not be earlier than master) 
This reverts commit 3bc3a3d90face93c38750ec87517067b56727adb.
 2016-01-17 20:03:14 +01:00
Monique Teillaud 4501417be1 update using "doxygen -u" 2016-01-17 20:03:13 +01:00
Philipp Möller 1bc0f97b61 Move customizations to a better place 2016-01-15 15:02:47 +01:00
Sebastien Loriot 4e9448cb9e Merge pull request #451 from GilesBathgate/throwing-destructors 
Introduces a CGAL_destructor_assertion macro.
 2016-01-14 14:08:10 +01:00
Sébastien Loriot d29de1bc4d fix doc bug 2016-01-13 11:03:41 +01:00
Simon Giraudot 40257fefb5 Merge branch 'Point_set_processing_3-Point_set_structuring-GF-old' into Point_set_processing_3-Point_set_structuring-GF 2016-01-12 11:53:09 +01:00
Sebastien Loriot 32a3972c33 Merge pull request #592 from afabri/CGAL-dont_submit_cleanup-GF 
Towards getting rid of dont_submit files
 2016-01-08 14:14:08 +01:00
Philipp Möller 8f411baf52 Remove ugly version hack of doc testsuite 
Pass the version directly to the testsuite instead of going through
temporary version.h file
 2016-01-08 11:49:23 +01:00
Sébastien Loriot e64ae35a6e Merge pull request #542 from bo0ts/Documentation-release_build2-pmoeller 
Allow to build the documentation in a release
 2016-01-07 09:21:46 +01:00
Andreas Fabri a41165b6eb various 2016-01-05 18:04:14 +01:00
Sebastien Loriot 2b49997c7e Merge pull request #493 from afabri/CGLAL-thread_local_storage-GF 
Remove boost thread dependency
 2016-01-04 16:49:26 +01:00
Philipp Möller 71b4e9c515 Use CGAL_FULL_VERSION in all Doxyfile.in 2015-12-17 16:33:28 +01:00
Philipp Möller def72347c9 Change huge if to early return 2015-12-10 17:05:53 +01:00
Philipp Möller 9642702bce Change huge if to early return 2015-12-10 17:05:53 +01:00
Philipp Möller 0ad467b321 Use generic example directories 2015-12-10 17:05:53 +01:00
Philipp Möller f767b35100 Remove unnecessary check 2015-12-10 17:05:53 +01:00
Philipp Möller fb4e1d8c84 Generate variables for example paths 2015-12-10 17:05:52 +01:00
Philipp Möller a49875ec8c Handle release mode when extracting all image paths 2015-12-10 17:05:52 +01:00
Philipp Möller e071e755ca Adapt pkglist_filter to releases 2015-12-10 17:05:52 +01:00
Philipp Möller 44b057f763 Generic reference 2015-12-10 17:05:52 +01:00
Philipp Möller 687f35be54 Adapt generate_how_to_cite to releases 2015-12-10 17:05:52 +01:00
Philipp Möller 79b7fc5081 Handle the INPUT cases where the whole include dir is used 2015-12-10 17:03:46 +01:00
Philipp Möller 81a8f982dc Handle the easy INPUT cases 
If INPUT is just PKG/doc/PKG, handle it automatically.
 2015-12-10 17:00:26 +01:00
Philipp Möller 35d2e7f1b6 Move the bib files and adjust paths 2015-12-10 17:00:25 +01:00
Philipp Möller f50b65d48f Change SOURCE_DIR 
Increase robustness of generate_how_to_cite
 2015-12-10 17:00:25 +01:00
Philipp Möller 59354a0060 Check return of generate_how_to_cite 2015-12-10 17:00:25 +01:00
Philipp Möller 38ff73c2b9 Use CGAL_PACKAGE_DOC_DIR 2015-12-10 17:00:25 +01:00
Philipp Möller 2c7f842391 No more subdirs 2015-12-10 17:00:24 +01:00
Philipp Möller 7deef1b20b Handle BRANCH_BUILD 2015-12-10 17:00:24 +01:00
Philipp Möller 992de97a7d Move BaseDoxyfile and associated stuff to resources 2015-12-10 17:00:24 +01:00
Philipp Möller 456a4349d1 Move components of Manual into the doc dir 2015-12-10 17:00:24 +01:00
Philipp Möller ccdae25ce8 2.8.11 is required now 2015-12-10 17:00:23 +01:00
Philipp Möller f38324f747 Move scripts as well 2015-12-10 17:00:23 +01:00
Philipp Möller d86c3f25b5 Move the resources of html_output_post_processing 2015-12-03 16:29:55 +01:00
Philipp Möller 7fec5e2014 Move Documentation/CMakeLists.txt 
The only sensible place to have it in a release is doc/ so we have to
move it into the subdirectory here.
 2015-12-03 16:27:57 +01:00
Sébastien Loriot bd7bd270b7 add missing _STATIC 2015-12-03 14:14:00 +01:00
Giles Bathgate d420c58755 Update the developer documentation. 
Provide information about the CGAL_destructor_assertion, and the
CGAL_NOEXCEPT macros.
 2015-12-02 20:09:09 +00:00
Sébastien Loriot 4e3a80fc08 improvements 2015-12-01 22:40:14 +01:00
Sébastien Loriot 308a503332 remove extra line added during merge conflict resolution 2015-11-30 11:00:08 +01:00
Sébastien Loriot 01a67e418b do not recommand boost Parameter 2015-11-26 13:57:01 +01:00
Clement Jamin 5eb2a28eea Merge branch 'gsoc2014-2d-reconstruction-ivovigan-old' into gsoc2014-2d-reconstruction-ivovigan 2015-11-25 16:25:48 +01:00
Sébastien Loriot a5d9601388 add a page on how to run the testsuite of a package or of all the packages 
taken from the internal wiki
 2015-11-23 22:56:47 +01:00
Sébastien Loriot 9e7edad655 list reasonnable boost libs we can use in CGAL 2015-11-23 22:27:34 +01:00
Andreas Fabri bb9dddf336 Add a chapter in the developer manual. Fix a bug in tss.h in case CGAL_HAS_THREADS is not defined 2015-11-23 16:50:09 +01:00
Sébastien Loriot 260a501941 support more g++ version and enhance doc 2015-11-23 10:21:21 +01:00
Weisheng Si bb4db543d6 Merge branch 'Cone_spanners_2-new_package-UWS-old' into Cone_spanners_2-new_package-UWS 
Conflicts:
	Documentation/doc/Documentation/Doxyfile.in
	Documentation/doc/Documentation/packages.txt
 2015-11-23 10:16:00 +11:00
Andreas Fabri 6b2c4dd7c6 Merge branch 'CGLAL-thread_local_storage-GF-old' into CGLAL-thread_local_storage-GF 2015-11-09 14:26:42 +01:00
Sebastien Loriot 2e493f297b Merge pull request #389 from afabri/CGAL-Qt3-GF 
Remove Qt3 based demos
 2015-10-23 17:08:49 +02:00
Clement Jamin f6a9afd028 Merge branch 'gsoc2014-2d-reconstruction-ivovigan-old' into gsoc2014-2d-reconstruction-ivovigan 2015-10-23 14:26:50 +02:00
Maxime Gimeno fecfd711a7 Finishing merge 
- Forgot one file with conflicts
 2015-10-09 14:11:42 +02:00
Maxime Gimeno 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
Sébastien Loriot 4787bda61f remove documented widget based on Qt3 2015-10-05 15:20:06 +02:00
Andreas Fabri adf615c427 explain in changes.html and the installation pages when Boost.Thread is no longer used 2015-10-05 09:43:36 +02:00
Andreas Fabri 833bd5c49c no Qt3 in the installation manual 2015-10-01 14:52:05 +02:00
Sébastien Loriot da650cbd1c Merge branch 'old/CGAL-Solver-packages-GF' into CGAL-Solver-package-GF 2015-09-26 15:47:54 +02:00
Maxime Gimeno 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
Simon Giraudot 36723443a4 Merge branch 'CGAL-Solver-package-GF-old' into CGAL-Solver-package-GF 2015-09-23 10:29:14 +02:00
Sébastien Loriot cdfc7f1c31 Merge branch 'old/CGAL-split_packages-GF' into CGAL-split_packages-GF 2015-09-23 10:08:41 +02:00
Simon Giraudot 3d3469524f Merge branch 'CGAL-Solver-package-GF-old' into CGAL-Solver-package-GF 2015-09-22 12:07:50 +02:00
Sébastien Loriot 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
Sébastien Loriot 68aa21292a Merge branch 'old/CGAL-Solver-packages-GF' into CGAL-Solver-package-GF 2015-09-21 07:34:18 +02:00
Sébastien Loriot 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
Sébastien Loriot 470e96e75c document msvc2015 support 2015-09-11 10:42:57 +02:00
Sébastien Loriot e0646e3ebb update old manual url 2015-09-10 14:03:45 +02:00
Andreas Fabri 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
Simon Giraudot e4c990f16d Remove references to Lapack in doc and examples 2015-09-07 12:18:19 +02:00
Simon Giraudot 63f77a05a5 Merge branch 'CGAL-Solver-package-GF-old' into CGAL-Solver-package-GF 2015-09-07 10:01:12 +02:00
Simon Giraudot d9d94f082e Update files with new package name (Poisson_surface_reconstruction_3) 2015-09-04 18:18:52 +02:00
Simon Giraudot 09f3659353 Improving doc 2015-09-02 15:40:30 +02:00
Simon Giraudot 8a46d3cd5e Include Lapack svd in Solver interface (another model for SvdTraits) 2015-08-26 14:49:27 +02:00
Simon Giraudot af8e73750c Merge branch 'CGAL-Solver-package-GF-old' into CGAL-Solver-package-GF 2015-08-20 11:51:34 +02:00
Andreas Fabri 67d72675fe split packages 2015-08-17 23:46:59 +02:00
Sébastien Loriot 999c123be1 document use of qcollectiongenerator and sqlite plugin driver 2015-08-07 14:47:00 +02:00
Monique Teillaud 578d846bf3 Update Chapter_checks.txt 
fix a few typos
 2015-07-31 13:31:26 +02:00
Laurent Rineau 1613066935 Documentation CGAL_assume in the dev manual 2015-07-30 13:14:14 +02:00
Laurent Rineau 9718bf7071 Merge pull request #206 from sloriot/Doc-add_clang_support 
Fix versions of support compilers
 2015-07-29 11:10:19 +02:00
Laurent Rineau dd0acaab3f Fix the versions of g++ and Intel Compiler that are supported 2015-07-29 10:40:56 +02:00
Sébastien Loriot 6d96dcf268 document the list of qt5 modules used 2015-07-28 18:21:38 +02:00
Sébastien Loriot 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
Sébastien Loriot 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
Sébastien Loriot 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
Sébastien Loriot 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
Sébastien Loriot 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
Laurent Rineau f40fe0dc2d Merge branch 'gsoc2013-Visibility_doc-hemmer' into CGAL-Qt5_support-GF 2015-07-10 18:07:26 +02:00
Laurent Rineau fa13f4ed0c Merge remote-tracking branch 'philaris/sdglinf-philaris' into CGAL-Qt5_support-GF 2015-07-10 17:28:07 +02:00
Laurent Rineau 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
Laurent Rineau 15c1469a54 CGAL requires CMake>=2.8.11. 2015-07-10 17:01:42 +02:00
Sébastien Loriot d70b65e431 Merge branch 'gsoc2013-Visibility_doc-hemmer' 
PR 145
 2015-07-10 15:25:39 +02:00
Sébastien Loriot 0c97a4e39c update installation instruction for configuring Qt5 2015-07-10 10:23:15 +02:00
Laurent Rineau 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
Sébastien Loriot e7563d3e05 Merge branch 'gsoc13-CurveSkeleton-new_package-xgao' 
Conflicts:
	Installation/changes.html
 2015-07-09 17:30:24 +02:00
Sébastien Loriot 85f6b81666 move position of the package in the overview 2015-07-09 10:43:44 +02:00
Laurent Rineau 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
Sébastien Loriot d3b8bcee72 remove mentions of QT4 in the installation doc 2015-07-07 18:05:52 +02:00
Andreas Fabri ba1ebb0e3d add empty line 2015-07-07 13:01:39 +02:00
Andreas Fabri 43a45d933c move line to ease merge 2015-07-07 12:59:59 +02:00
Laurent Rineau 49c2cdc19a Merge branch 'master' into sdglinf-philaris 
Conflicts:
	Installation/changes.html
 2015-07-06 18:33:08 +02:00
Laurent Rineau 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
Sébastien Loriot 30c11bd32d rename package Mean_curvature_skeleton -> Surface_mesh_skeletonization 2015-07-03 16:05:56 +02:00
Michael Hemmer 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
Andreas Fabri b4595e8802 remove empty line 2015-07-02 12:57:17 +02:00
Andreas Fabri e076bc179c move lines to facilitate merge 2015-07-02 12:48:34 +02:00
Andreas Fabri 9087f863a4 fix previous commit 2015-07-01 17:40:57 +02:00
Andreas Fabri 4c841d73e8 fix previous commit 2015-07-01 17:38:37 +02:00
Andreas Fabri bec3370540 avoid merge conflicts by moving lines 2015-07-01 17:03:13 +02:00
Andreas Fabri 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
Clement Jamin 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
Clement Jamin 39533f7b5b Merge branch 'gsoc2014-2d-reconstruction-ivovigan-old' into gsoc2014-2d-reconstruction-ivovigan 2015-06-30 10:32:54 +02:00
Panagiotis Cheilaris 04f3bc1454 SDG Linf doc: add fig dir for list of packages 2015-06-30 10:32:05 +02:00
Panagiotis Cheilaris aa5545c8b4 add SDG Linf to packages.txt 2015-06-30 10:32:04 +02:00
Panagiotis Cheilaris 55b77d06de add SDG Linf in doc dependencies 2015-06-30 10:31:58 +02:00
Maxime Gimeno 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
Sébastien Loriot 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
Alexander Kobel 8ae9c144a8 make cgal_create_CMakeLists and its brethren recognize all common C++ source file extensions 
Rationale: cgal_create_CMakeLists and related scripts used to not
consider files ending on anything else than .cpp or .C as C++ sources.
This patch allows for the list of extensions considered as C++ source
files as stated in the g++ man page.
 2015-06-25 15:55:55 +02:00
Laurent Rineau 5f8116e075 Precision avec SFINAE, access control, and C++11 2015-06-23 19:30:24 +02:00
Laurent Rineau cbf2104c5f Fix the link to our Sympa archives 2015-06-19 11:05:34 +02:00
Sébastien Loriot df47015db9 Merge branch 'old/Advancing_front_surface_reconstruction-afabri' into Advancing_front_surface_reconstruction-afabri 
Conflicts:
	Documentation/doc/Documentation/Doxyfile.in
	Documentation/doc/Documentation/dependencies
	Polyhedron/demo/Polyhedron/cgal_test_with_cmake
 2015-06-18 09:12:12 +02:00
Laurent Rineau 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
Clement Jamin 1097079153 Merge branch 'Point_set_shape_detection_3-cjamin-old' into Point_set_shape_detection_3-cjamin 2015-06-12 16:04:59 +02:00
Clement Jamin f40f58f507 Merge branch 'gsoc2014-2d-reconstruction-ivovigan-old' into gsoc2014-2d-reconstruction-ivovigan 2015-06-12 10:53:04 +02:00
Andreas Fabri 4e9eefd891 Merge branch 'Advancing_front_surface_reconstruction-afabri-old' into Advancing_front_surface_reconstruction-afabri 2015-06-08 15:17:47 +02:00
Laurent Rineau 648ccb1510 CMake>=2.6.3 is required 
I have tested: with CMake-2.6.2, there is a configuration error:

CMake Error: Error in cmake code at
/home/lrineau/Git/cgal/Installation/cmake/modules/CGAL_Macros.cmake:213:
Parse error.  Function missing ending ")".  Instead found left paren with text "(".

With CMake-2.6.3, that works.
 2015-06-08 14:09:51 +02:00
Sébastien Loriot 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
Andreas Fabri 674159d412 fixes of doxygen warnings/errors 2015-04-14 14:37:42 +02:00
Sven Oesau de5058ae84 Merge branch 'Point_set_shape_detection_3-cjamin_old' into Point_set_shape_detection_3-cjamin 
Conflicts:
	Documentation/doc/Documentation/dependencies
	Documentation/doc/Documentation/packages.txt
 2015-04-03 16:01:03 +02:00
Jane Tournois 9f1f8ae95d add random access range 
and use boost::size instead of distance
 2015-04-01 18:11:39 +02:00
Laurent Rineau 4eef28be7e Minimal version of Boost: 1.48 2015-04-01 17:31:17 +02:00
Maxime Gimeno 52dc3b265d Merge remote-tracking branch 'remotes/cgal-public-dev/gsoc2014-CGAL-Qt5_support-vialon' into to-qt5 
All CMake files modified by the branch 'gsoc2014-CGAL-Qt5_support-vialon' have been reset.

Conflicts:
	GraphicsView/demo/Polygon/CMakeLists.txt
	GraphicsView/src/CGAL_Qt4/CMakeLists.txt
	GraphicsView/src/CGAL_Qt4/GraphicsView.qtmoc.cmake
	Installation/cmake/modules/CGALConfig_binary.cmake.in
	Installation/cmake/modules/CGALConfig_install.cmake.in
	Installation/cmake/modules/CGAL_Macros.cmake
	Linear_cell_complex/demo/Linear_cell_complex/CMakeLists.txt
	Linear_cell_complex/demo/Linear_cell_complex/MainWindow.cpp
	Mesh_3/demo/Mesh_3/CMakeLists.txt
	Polyhedron/demo/Polyhedron/CMakeLists.txt
	Polyhedron/demo/Polyhedron/Polyhedron_demo_edit_polyhedron_plugin.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_demo_join_polyhedra_plugin.cpp
	Polyhedron/demo/Polyhedron/Scene.cpp
	Polyhedron/demo/Polyhedron/implicit_functions/CMakeLists.txt
	Polyhedron/demo/Polyhedron/polyhedron_demo_macros.cmake
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/CMakeLists.txt
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/MainWindow.cpp
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_average_spacing_plugin.cpp
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_cleaning_plugin.cpp
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_inside_out_plugin.cpp
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_local_spacing_plugin.cpp
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_normal_estimation_plugin.cpp
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_off_plugin.cpp
	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
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_simplification_plugin.cpp
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_smoothing_plugin.cpp
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_xyz_plugin.cpp
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo.cpp
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Polyhedron_demo_plugin_helper.cpp
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Scene.cpp
	Triangulation_3/demo/Triangulation_3/CMakeLists.txt
 2015-03-30 16:02:51 +02:00
Michael Hemmer 5767addb9c Merge branch 'gsoc2013-Visibility_doc-hemmer-old' into gsoc2013-Visibility_doc-hemmer 
Conflicts:
	Documentation/biblio/cgal_manual.bib
	Documentation/biblio/geom.bib
	Documentation/doxyassist.xml
 2015-03-26 16:26:15 +01:00
Andreas Fabri 3344ff0909 Add doc for package Solver_interface 2015-03-24 13:42:58 +01:00
Jane Tournois d39f201724 in triangulate_hole_polyline, replace begin and end iterators by PointRanges 2015-03-10 11:38:08 +01:00
Weisheng Si 0975502aee Add Cone_spanners_2 to dependencies 2015-03-05 11:32:31 +11:00
Weisheng Si 56bf3f7f97 Cone_based_spanners --> Cone_spanners_2 2015-03-05 08:14:57 +11:00
Sébastien Loriot 1ed289cc7e Merge branch 'old/gsoc13-CurveSkeleton-new_package-xgao' into gsoc13-CurveSkeleton-new_package-xgao 
Conflicts:
	Documentation/doc/Documentation/Doxyfile.in
	Documentation/resources/how_to_cite_cgal.bib.in
 2015-02-09 12:43:41 +01:00
Sébastien Loriot 137805d091 Merge branch 'old/Polygon_mesh_processing-GF' 
Conflicts:
	Operations_on_polyhedra/include/CGAL/orient_polyhedron_3.h
	Polygon_mesh_processing/include/CGAL/orient_polygon_soup.h
	Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp
	Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.h
 2015-01-30 17:55:22 +01:00
Andreas Fabri 31855de8be Merge branch 'Advancing_front_surface_reconstruction-afabri-old' into Advancing_front_surface_reconstruction-afabri 
Conflicts:
	Documentation/doc/Documentation/Doxyfile.in
	Documentation/doc/Documentation/dependencies
	Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.h
 2015-01-15 18:56:05 +01:00
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
Laurent Rineau c6ece2b10e Fix permissions 2015-01-12 16:23:14 +01:00
Sébastien Loriot e9763e3acf Merge branch 'old/Polygon_mesh_processing-GF' into Polygon_mesh_processing-GF 
Conflicts:
	Documentation/doc/Documentation/Doxyfile.in
	Documentation/doc/Documentation/dependencies
	Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/compute_normal.h
	Polygon_mesh_processing/include/CGAL/Self_intersection_polyhedron_3.h
 2015-01-12 11:47:38 +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 babaa99826 Merge branch 'CGAL-Getting_Started-GF' 
Approved by the release manager
Conflicts:
	Documentation/doc/Documentation/main.txt
 2015-01-12 11:29:26 +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 53c52bc516 Merge branch 'old/Scale_space_reconstruction_3-tvanlank' into Scale_space_reconstruction_3-tvanlank 2015-01-09 14:03:59 +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
Andreas Fabri a801f9e185 Improve the examples which illustrate problems with double 2015-01-08 12:28:14 +01:00
Sébastien Loriot fc6f9368a0 move Hole Filling in the new Polygon Mesh Processing package 2015-01-06 11:37:25 +01:00
Sébastien Loriot d52e392748 Merge branch 'Polyhedron_HoleFilling-GF' into Polygon_mesh_processing-GF 2015-01-06 11:05:21 +01:00
Sébastien Loriot 67cb148918 fix doc warnings and add to package overview 2015-01-06 10:52:48 +01:00
Andreas Fabri 120890cacc Add manual.txt 2014-12-30 12:19:55 +01:00
Sébastien Loriot c480d71f22 Merge branch 'old/Scale_space_reconstruction_3-tvanlank' into Scale_space_reconstruction_3-tvanlank 
Conflicts:
	.gitignore
	Polyhedron/demo/Polyhedron/CMakeLists.txt
 2014-12-29 10:15:53 +01:00
Andreas Fabri 766673bd8c resolve merge conflicts 2014-12-22 17:46:59 +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 4fe13d1b32 Merge branch 'gsoc13-CurveSkeleton-new_package-xgao-old' into gsoc13-CurveSkeleton-new_package-xgao 
Conflicts:
	Documentation/doc/Documentation/packages.txt
 2014-12-18 07:12:27 +01:00
Jane Tournois 18941ef053 fix documentation about how to install TBB on Windows 2014-12-15 16:09:14 +01:00
Sébastien Loriot 63406293e1 Merge branch 'Projection_traits-add_more_functors-sloriot' into barycentric_coordinates_2-dmitry 
Conflicts:
	Documentation/biblio/cgal_manual.bib
	Documentation/doc/Documentation/Doxyfile.in
	Documentation/doc/Documentation/dependencies
 2014-12-12 14:24:17 +01:00
Andreas Fabri b2858d9408 add a link to organization in Getting Started 2014-12-03 16:54:33 +01:00
Andreas Fabri 853a78a9be use real CGAL classes in concepts/models 2014-12-03 14:10:16 +01:00
Andreas Fabri 631e3452cc Add a page on the Organization of the Manual 2014-12-03 08:37:55 +01:00
Andreas Fabri 34a06c004a Add a figure with concepts and models 2014-12-01 21:26:36 +01:00
Andreas Fabri d48a67f36a polish links 2014-12-01 11:07:20 +01:00
Andreas Fabri 4eb40cfc94 Add Organization of the Reference Manual 2014-11-28 18:15:38 +01:00
Andreas Fabri 6f4123db35 cleanup 2014-11-28 16:12:50 +01:00
Andreas Fabri 5f3d0f2e34 tell that HalfedgeGraph and InputIterator are also concepts 2014-11-28 14:06:29 +01:00
Andreas Fabri 6d07743d29 Add another example for concept/model 2014-11-28 11:15:28 +01:00
Andreas Fabri ef657ba6fb Add a section for Concepts and Models 2014-11-27 15:10:27 +01:00
Sébastien Loriot 8a7b5448b7 Merge branch 'old/Polyhedron_HoleFilling-GF' into Polyhedron_HoleFilling-GF 
Conflicts:
	Documentation/doc/Documentation/packages.txt
 2014-11-21 13:17:40 +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 4355794781 iterator_range moved the package 2014-11-12 14:40:51 +01:00
Laurent Rineau de6c026d8f Merge branch 'GraphicsView-try_export_to_SVG-lrineau' into Triangulation_2-NewPolylineConstraint-GF 2014-11-07 17:40:01 +01:00