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

481 Commits

Author SHA1 Message Date
Laurent Rineau d26c2e9e53 Merge pull request #4475 from lrineau/Installation-workaround_for_SWIG_parser-xantares-lrineau 
Workaround for SWIG parser
 2020-01-17 16:26:13 +01:00
Michel Zou 3b8d77aa8a version.h: workaround for SWIG parsing 2020-01-14 10:01:00 +01:00
Guillaume Damiand 90457b38c7 Update licences 2019-11-26 14:21:39 +01:00
Guillaume Damiand 9a50c0f830 Merge branch 'master' into Surface_mesh_topology-gdamiand 2019-11-26 13:22:03 +01:00
Laurent Rineau 68ca489924 Next release on master will be 5.1-dev 2019-11-08 18:13:44 +01:00
Laurent Rineau 27dcff6141 Prepare CGAL-5.0 finale version 2019-11-08 10:58:29 +01:00
Sébastien Loriot bff5db68e1 fix some remaining license notice + add a missing LicenseRef-Commercial 2019-10-31 14:17:20 +01:00
Laurent Rineau 387f55cfca Next version in this branch will be 5.0-beta3 (or the final release) 2019-10-31 10:32:50 +01:00
Sébastien Loriot 52164b1fba First pass on removing license notice in header for LGPL files 2019-10-19 15:40:30 +02:00
Sébastien Loriot 7356421d80 introduce Commercial license SPDX tag 2019-10-19 12:15:19 +02:00
Sébastien Loriot 1c829dcb08 remove extra space 2019-10-18 22:04:37 +02:00
Sébastien Loriot 9bd9c68b83 update LGPL[23]+ and GPL[23]+ SPDX tags 
ack -l --no-svg "SPDX-License-Identifier: GPL-3.0\+" | xargs sed -i "s/SPDX-License-Identifier: GPL-3.0+/SPDX-License-Identifier: GPL-3.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-3.0\+" | xargs sed -i "s/SPDX-License-Identifier: LGPL-3.0+/SPDX-License-Identifier: LGPL-3.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: GPL-2.0\+" | xargs sed -i "s/SPDX-License-Identifier: GPL-2.0+/SPDX-License-Identifier: GPL-2.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-2.0\+" | xargs sed -i "s/SPDX-License-Identifier: LGPL-2.0+/SPDX-License-Identifier: LGPL-2.0-or-later/"
 2019-10-18 21:57:54 +02:00
Laurent Rineau 47fcaf3d47 Merge pull request #4265 from lrineau/CGAL-really_header_only-GF 
Do not require -DCGAL_HEADER_ONLY
 2019-10-15 16:34:09 +02:00
Laurent Rineau 119055d688 Merge pull request #4281 from sloriot/CGAL-default_endian 
Add a way to define a default endianness
 2019-10-15 16:31:39 +02:00
Laurent Rineau b6a935c3cf Merge pull request #4292 from maxGimeno/CGAL_Config-Fix_typo-maxGimeno 
Remove extra S in macro
 2019-10-15 16:31:24 +02:00
Maxime Gimeno 856b7722f1 Remove extra S in macro 2019-10-15 09:03:13 +02:00
Laurent Rineau 9c67734dcc Push the `#define CGAL_HEADER_ONLY` at the top 2019-10-11 12:02:25 +02:00
Laurent Rineau e872e74654 Refactor the code 2019-10-10 17:59:46 +02:00
Sébastien Loriot 2f1ab3a86d rename macro 2019-10-10 14:45:42 +02:00
Sébastien Loriot 66e3b216be add a way to define a default endian 2019-10-10 13:00:33 +02:00
Laurent Rineau 779ef144fe Do not require -DCGAL_HEADER_ONLY 
Now, that macro is set unless `CGAL_NOT_HEADER_ONLY` is 1.
 2019-10-01 18:10:30 +02:00
Laurent Rineau 44547d40ec Next release in this branch will be 5.0-beta2 2019-09-30 15:25:45 +02:00
Laurent Rineau 5be38d3af0 Next release in this branch will be 4.14.2 2019-09-30 15:19:47 +02:00
Laurent Rineau 1bce3f7909 Merge branch 'releases/CGAL-4.14-branch' 2019-09-27 16:25:29 +02:00
Laurent Rineau 0b66eb0d23 Merge remote-tracking branch 'cgal/releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch 
# Conflicts:
#	.travis/install.sh
 2019-09-27 16:24:41 +02:00
Maxime Gimeno 2473456405 update auto-link.h 2019-09-27 16:06:12 +02:00
Sébastien Loriot 724e70b97f Merge pull request #3984 from LiangliangNan/master 
New package 'Polygonal Surface Reconstruction' and an extension of 'Solver Interface'
 2019-07-18 17:05:25 +02:00
Sébastien Loriot 1f8065c6c3 Merge pull request #3885 from MaelRL/PMP-Locate-GF 
PMP: Add locate.h and rewrite Triangulation_2 graph traits
 2019-07-18 16:40:49 +02:00
Sebastien Loriot 667e4022f7
Merge pull request #4060 from sloriot/CGAL-doc_match_brackets 
match @{ and @}
 2019-07-18 16:26:43 +02:00
Laurent Rineau 58e12565e3 Prepare release candidates for 5.0-beta1 2019-07-12 15:31:07 +02:00
Guillaume Damiand 7cd85f845b Merge branch 'master' into Surface_mesh_topology-gdamiand 2019-07-10 15:32:21 +02:00
Laurent Rineau d3b9d89596 Merge pull request #4013 from lrineau/CGAL_Core-no_need_for_Boost.Thread-GF 
Remove the need for Boost.Thread (but for CGAL_Core and gcc<9.1)
 2019-07-10 14:22:53 +02:00
Sébastien Loriot 983645a51a match @{ and @} 2019-07-05 21:49:46 +02:00
Maxime Gimeno 7155df2743 Merge remote-tracking branch 'cgal/master' into liangliang_master 2019-07-01 14:59:24 +02:00
Mael Rouxel-Labbé f68141a6d3 Merge branch 'PMP-Locate-GF-old' into PMP-Locate-GF 2019-07-01 11:28:25 +02:00
Guillaume Damiand 56abe3c367 Merge branch 'master' into Surface_mesh_topology-gdamiand 2019-06-28 13:28:50 +02:00
Laurent Rineau 2ce7800239 Unfortunately gcc < 9.1 has bug with thread_local that impact CGAL 2019-06-24 14:27:20 +02:00
Guillaume Damiand 1dbc088459 Update licences; move undocumented files to internal (both directory and namespace) 2019-06-20 16:51:53 +02:00
Guillaume Damiand 62167eb065 Add surface mesh topology package in gpl list 2019-06-20 16:13:42 +02:00
Laurent Rineau 2a5b558eb5 Merge branch 'master' into NewKernel_d-lazy_Epeck_d-glisse 2019-06-20 10:28:01 +02:00
Liangliang Nan 4588ba5d9d Merge branch 'master' of https://github.com/CGAL/cgal 2019-06-19 15:08:53 +02:00
Mael Rouxel-Labbé 7f6cb0411c Merge branch 'PMP-Locate-GF-old' into PMP-Locate-GF 2019-06-18 08:20:16 +02:00
Liangliang Nan fadaee63a8 integrated PolyFit 2019-06-05 17:50:37 +02:00
Andreas Fabri f7b7b9957f Merge remote-tracking branch 'cgal/master' into CGAL-null_ptr-GF 2019-06-05 14:47:11 +02:00
Andreas Fabri 4581f1b7a8 Morte replacements 2019-06-05 08:39:55 +02:00
Andreas Fabri 5532b84b4f nullptr_t -> std::nullptr_t 2019-06-05 07:28:56 +02:00
Dmitry Anisimov 3738de08ed
Merge branch 'master' into Point_set_shape_detection_3-make_it_general_with_region_growing-danston 2019-05-23 10:38:45 +02:00
Laurent Rineau 419032d859 Merge pull request #3947 from MaelRL/CGAL-Fix_typos-GF 
Fix some typos in code/comments/documentation
 2019-05-23 08:50:14 +02:00
Mael Rouxel-Labbé 2848158354 Fix typos 2019-05-20 08:54:04 +02:00
Laurent Rineau 90782d4b7f Revert the merge of two pull-requests that target CGAL-4.14-branch 
- Revert "Merge pull request #3857 from MaelRL/CGAL-Fix_duplicate_non_manifold_vertices-GF"
- Revert "Merge pull request #3898 from lrineau/Mesh_3-stop_during_protection-lrineau"
 2019-05-14 17:50:45 +02:00