Skip to content

Commit e210184

Browse files
committed
Merge remote-tracking branch 'cgal/master'
2 parents 58cf16d + 418b00e commit e210184

File tree

19 files changed

+47
-584
lines changed

19 files changed

+47
-584
lines changed

Documentation/doc/biblio/cgal_manual.bib

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1545,17 +1545,6 @@ @book{ cgal:l-lscsd-96
15451545
,update = "97.04 kettner"
15461546
}
15471547

1548-
@article{cgal:l-lsqp-82,
1549-
title={Least squares quantization in PCM},
1550-
author={Lloyd, Stuart},
1551-
journal={IEEE transactions on information theory},
1552-
volume={28},
1553-
number={2},
1554-
pages={129--137},
1555-
year={1982},
1556-
publisher={IEEE}
1557-
}
1558-
15591548
@InProceedings{ cgal:lprm-lscm-02,
15601549
author = {Bruno L{\'e}vy and Sylvain Petitjean and Nicolas Ray
15611550
and J{\'e}rome Maillot},
@@ -2778,7 +2767,7 @@ @incollection{msri52:liu-snoeyink-05
27782767
editor = "Jacob E. Goodman, J\'anos Pach and Emo Welzl",
27792768
year = {2005},
27802769
pages = {439-458},
2781-
URL = {http://library.slmath.org/books/Book52/files/23liu.pdf},
2770+
URL = {https://library.slmath.org/books/Book52/files/23liu.pdf},
27822771
publisher = {MSRI Publications}
27832772
}
27842773

Installation/include/CGAL/version.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
#define CGAL_VERSION_H
1818

1919
#ifndef SWIG
20-
#define CGAL_VERSION 6.0-beta2
20+
#define CGAL_VERSION 6.0
2121
#define CGAL_GIT_HASH abcdef
2222
#endif
23-
#define CGAL_VERSION_NR 1060000920
23+
#define CGAL_VERSION_NR 1060001000
2424
#define CGAL_SVN_REVISION 99999
25-
#define CGAL_RELEASE_DATE 20240701
25+
#define CGAL_RELEASE_DATE 20240925
2626

2727
#include <CGAL/version_macros.h>
2828

Installation/lib/cmake/CGAL/CGALConfigVersion.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ set(CGAL_MAJOR_VERSION 6)
22
set(CGAL_MINOR_VERSION 0)
33
set(CGAL_BUGFIX_VERSION 0)
44
include(${CMAKE_CURRENT_LIST_DIR}/CGALConfigBuildVersion.cmake)
5-
set(CGAL_VERSION_PUBLIC_RELEASE_VERSION "6.0-beta2")
5+
set(CGAL_VERSION_PUBLIC_RELEASE_VERSION "6.0")
66
set(CGAL_VERSION_PUBLIC_RELEASE_NAME "CGAL-${CGAL_VERSION_PUBLIC_RELEASE_VERSION}")
77

88
if (CGAL_BUGFIX_VERSION AND CGAL_BUGFIX_VERSION GREATER 0)

Maintenance/infrastructure/cgal.geometryfactory.com/.autocgal_with_cmake_rc

Lines changed: 0 additions & 26 deletions
This file was deleted.

Maintenance/infrastructure/cgal.geometryfactory.com/.autocgalrc

Lines changed: 0 additions & 40 deletions
This file was deleted.

Maintenance/infrastructure/cgal.geometryfactory.com/.cgal_create_new_release_rc

Lines changed: 0 additions & 5 deletions
This file was deleted.

Maintenance/infrastructure/cgal.geometryfactory.com/.cgalmanualrc

Lines changed: 0 additions & 24 deletions
This file was deleted.

Maintenance/infrastructure/cgal.geometryfactory.com/bin/cgal_diff_results

Lines changed: 0 additions & 26 deletions
This file was deleted.

Maintenance/infrastructure/cgal.geometryfactory.com/bin/cgal_release.py

Lines changed: 0 additions & 87 deletions
This file was deleted.

Maintenance/infrastructure/cgal.geometryfactory.com/bin/collect_data_directories

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)