From d39a8d62ac9b3eb1ec47f4c75a3b8966e2762805 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Wed, 5 Oct 2011 09:24:19 +0000 Subject: [PATCH 02/75] Avoid to auto-link with CGAL.lib while building the CGAL library itself --- Installation/include/CGAL/auto_link/CGAL.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Installation/include/CGAL/auto_link/CGAL.h b/Installation/include/CGAL/auto_link/CGAL.h index ecc4b8377ad..83420f6686c 100644 --- a/Installation/include/CGAL/auto_link/CGAL.h +++ b/Installation/include/CGAL/auto_link/CGAL.h @@ -21,10 +21,14 @@ #define CGAL_AUTO_LINK_CGAL_H #ifndef CGAL_NO_AUTOLINK_CGAL +#ifndef CGAL_EXPORTS +// If CGAL_EXPORTS is defined it means that we are building the CGAL +// library as a DLL. #define CGAL_LIB_NAME CGAL #include +#endif // CGAL_EXPORTS #endif // CGAL_NO_AUTOLINK_CGAL #endif // CGAL_AUTO_LINK_CGAL_H From 9daee5c42fc08b919d4e022551ac6307797af245 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Wed, 5 Oct 2011 09:51:35 +0000 Subject: [PATCH 03/75] Add link_directories during the CGAL library creation (needed for auto-linking on Windows). --- Installation/src/CGAL/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Installation/src/CGAL/CMakeLists.txt b/Installation/src/CGAL/CMakeLists.txt index 1da923d1912..04d8e51a622 100644 --- a/Installation/src/CGAL/CMakeLists.txt +++ b/Installation/src/CGAL/CMakeLists.txt @@ -4,6 +4,8 @@ include_directories (${CGAL_3RD_PARTY_INCLUDE_DIRS}) add_definitions(${CGAL_3RD_PARTY_DEFINITIONS}) +link_directories(${CGAL_3RD_PARTY_LIBRARIES_DIRS}) + target_link_libraries(CGAL ${CGAL_3RD_PARTY_LIBRARIES}) set( CGAL_BASENAME CGAL ) From e8869cf82d0cb4b9446a1d8d2699179a41ade5b4 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Wed, 5 Oct 2011 10:08:52 +0000 Subject: [PATCH 04/75] Make CGAL lib not depend on CGAL_Core --- Installation/include/CGAL/auto_link/CORE.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Installation/include/CGAL/auto_link/CORE.h b/Installation/include/CGAL/auto_link/CORE.h index 99301252f5c..38141bf791f 100644 --- a/Installation/include/CGAL/auto_link/CORE.h +++ b/Installation/include/CGAL/auto_link/CORE.h @@ -21,10 +21,15 @@ #define CGAL_AUTO_LINK_CORE_H #ifndef CGAL_NO_AUTOLINK_CORE +#ifndef CGAL_EXPORTS +// If CGAL_EXPORTS is defined it means that we are building the CGAL +// library as a DLL. The CGAL.dll does not really depend on CGAL_Core, +// whatever the header inclusion graph says. #define CGAL_LIB_NAME CGAL_Core #include +#endif // CGAL_EXPORTS #endif // CGAL_NO_AUTOLINK_CORE #endif // CGAL_AUTO_LINK_CORE_H From cbfe32ce3792b92d2c08880ae5915446d9a51fa9 Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Wed, 5 Oct 2011 19:12:23 +0000 Subject: [PATCH 05/75] Add declspecs for Visual C++ so that we can build dlls --- Core/include/CGAL/CORE/BigFloat.h | 5 +- Core/include/CGAL/CORE/BigFloatRep.h | 2 +- Core/include/CGAL/CORE/BigInt.h | 2 +- Core/include/CGAL/CORE/Config.h | 2 + Core/include/CGAL/CORE/CoreAux.h | 17 ++-- Core/include/CGAL/CORE/CoreDefs.h | 36 ++++---- Core/include/CGAL/CORE/Expr.h | 12 +-- Core/include/CGAL/CORE/ExprRep.h | 90 +++++++++---------- Core/include/CGAL/CORE/Gmp.h | 8 +- Core/include/CGAL/CORE/Real.h | 11 +-- Core/include/CGAL/CORE/RefCount.h | 5 +- Core/include/CGAL/CORE/export.h | 24 +++++ Core/include/CGAL/CORE/extLong.h | 6 +- Installation/CMakeLists.txt | 1 + Installation/cmake/modules/CGAL_Common.cmake | 6 +- .../cmake/modules/CGAL_SetupBoost.cmake | 7 +- Installation/include/CGAL/auto_link/CORE.h | 3 +- Installation/include/CGAL/config.h | 2 + Installation/include/CGAL/export.h | 24 +++++ Installation/src/CGAL/CMakeLists.txt | 5 +- Installation/src/CMakeLists.txt | 1 - .../include/CGAL/Bbox_2_Line_2_intersection.h | 2 +- .../include/CGAL/Ray_2_Bbox_2_intersection.h | 4 +- Kernel_23/include/CGAL/Origin.h | 4 +- .../include/CGAL/aff_transformation_tags.h | 10 +-- .../CGAL/Kinetic/internal/debug_counters.h | 10 +-- .../Polynomial/internal/numeric_solvers.h | 6 ++ .../CGAL/Modular_arithmetic/Residue_type.h | 22 ++--- Modular_arithmetic/include/CGAL/primes.h | 2 +- Nef_2/include/CGAL/Nef_2/Polynomial.h | 12 +-- Number_types/include/CGAL/FPU.h | 2 +- Number_types/include/CGAL/MP_Float.h | 37 +++++++- Profiling_tools/include/CGAL/Real_timer.h | 2 +- Profiling_tools/include/CGAL/Timer.h | 2 +- Random_numbers/include/CGAL/Random.h | 32 +++---- STL_Extension/include/CGAL/assertions.h | 7 +- .../include/CGAL/assertions_behaviour.h | 4 + .../include/CGAL/IO/File_header_OFF.h | 2 +- .../CGAL/IO/File_header_extended_OFF.h | 2 +- .../include/CGAL/IO/File_scanner_OFF.h | 2 +- .../include/CGAL/IO/File_writer_OFF.h | 2 +- .../include/CGAL/IO/File_writer_VRML_2.h | 2 +- .../include/CGAL/IO/File_writer_inventor.h | 2 +- .../include/CGAL/IO/File_writer_wavefront.h | 2 +- iostream/include/CGAL/IO/Color.h | 22 ++--- iostream/include/CGAL/IO/io.h | 15 +++- 46 files changed, 298 insertions(+), 180 deletions(-) create mode 100755 Core/include/CGAL/CORE/export.h create mode 100755 Installation/include/CGAL/export.h diff --git a/Core/include/CGAL/CORE/BigFloat.h b/Core/include/CGAL/CORE/BigFloat.h index ff76b12805c..11e2741c5a5 100644 --- a/Core/include/CGAL/CORE/BigFloat.h +++ b/Core/include/CGAL/CORE/BigFloat.h @@ -43,7 +43,8 @@ class Expr; /// \class BigFloat BigFloat.h /// \brief BigFloat is a class of Float-Point number with error bounds. typedef RCImpl RCBigFloat; -class BigFloat : public RCBigFloat { + +class CGAL_CORE_EXPORT BigFloat : public RCBigFloat { public: /// \name Constructors and Destructor //@{ @@ -473,7 +474,7 @@ inline int cmp(const BigFloat& x, const BigFloat& y) { return x.cmp(y); } /// pow -BigFloat pow(const BigFloat&, unsigned long); +CGAL_CORE_EXPORT BigFloat pow(const BigFloat&, unsigned long); /// power inline BigFloat power(const BigFloat& x, unsigned long p) { return pow(x, p); diff --git a/Core/include/CGAL/CORE/BigFloatRep.h b/Core/include/CGAL/CORE/BigFloatRep.h index 095f85c5c1e..21cc0e0416f 100644 --- a/Core/include/CGAL/CORE/BigFloatRep.h +++ b/Core/include/CGAL/CORE/BigFloatRep.h @@ -45,7 +45,7 @@ namespace CORE { class BigFloat; // class BigFloatRep (internal representation for BigFloat) -class BigFloatRep : public RCRepImpl { +class CGAL_CORE_EXPORT BigFloatRep : public RCRepImpl { public: static long chunkCeil(long bits); //inline static long chunkFloor(long bits); //inline diff --git a/Core/include/CGAL/CORE/BigInt.h b/Core/include/CGAL/CORE/BigInt.h index 3e06a164d8b..732ccdcd7ac 100644 --- a/Core/include/CGAL/CORE/BigInt.h +++ b/Core/include/CGAL/CORE/BigInt.h @@ -106,7 +106,7 @@ private: }; typedef RCImpl RCBigInt; -class BigInt : public RCBigInt { +class CGAL_CORE_EXPORT BigInt : public RCBigInt { public: /// \name Constructors //@{ diff --git a/Core/include/CGAL/CORE/Config.h b/Core/include/CGAL/CORE/Config.h index 907c9a1dee5..255d37835f6 100644 --- a/Core/include/CGAL/CORE/Config.h +++ b/Core/include/CGAL/CORE/Config.h @@ -17,4 +17,6 @@ #include #include +#include + #endif // _CORE_CONFIG_H_ diff --git a/Core/include/CGAL/CORE/CoreAux.h b/Core/include/CGAL/CORE/CoreAux.h index d4e57297446..1f78cfe89ec 100644 --- a/Core/include/CGAL/CORE/CoreAux.h +++ b/Core/include/CGAL/CORE/CoreAux.h @@ -114,22 +114,22 @@ inline const T core_abs(const T& a) { /// returns floor log base 2 of abs(x) /** CONVENTION: lg(0) = -1 */ -int flrLg(long x); +CGAL_CORE_EXPORT int flrLg(long x); /// returns floor log base 2 of unsigned long x /** CONVENTION: lg(0) = -1 */ -int flrLg(unsigned long x); +CGAL_CORE_EXPORT int flrLg(unsigned long x); /// returns ceiling log base 2 of abs(x) /** CONVENTION: lg(0) = -1 */ -int clLg(long x); +CGAL_CORE_EXPORT int clLg(long x); /// returns ceiling log base 2 of unsigned long x /** CONVENTION: lg(0) = -1 */ -int clLg(unsigned long x); +CGAL_CORE_EXPORT int clLg(unsigned long x); /// gcd for machine type long -long gcd(long m, long n); +CGAL_CORE_EXPORT long gcd(long m, long n); /// abs for int type inline int abs(int x) { @@ -159,18 +159,19 @@ inline std::ostream& operator<< (std::ostream& o, const std::string& s) { /// implements the "integer mantissa" function // (See CORE_PATH/progs/ieee/frexp.cpp for details) -double IntMantissa(double d); +CGAL_CORE_EXPORT double IntMantissa(double d); /// implements the "integer exponent" function // (See CORE_PATH/progs/ieee/frexp.cpp for details) -int IntExponent(double d); +CGAL_CORE_EXPORT int IntExponent(double d); /// Writes out an error or warning message in the local file CORE_DIAGFILE /** If last argument (err) is TRUE, then this is considered an error * (not just warning). In this case, the message is also printed in * std::cerr, using std::perror(). * */ -void core_error(std::string msg, std::string file, int lineno, bool err); +CGAL_CORE_EXPORT void core_error(std::string msg, std::string file, int lineno, bool err); + /// This is for debugging messages inline void core_debug(std::string msg){ std::cout << __FILE__ << "::" << __LINE__ << ": " << msg diff --git a/Core/include/CGAL/CORE/CoreDefs.h b/Core/include/CGAL/CORE/CoreDefs.h index df43c9a7d5b..6e0ae26ffdc 100644 --- a/Core/include/CGAL/CORE/CoreDefs.h +++ b/Core/include/CGAL/CORE/CoreDefs.h @@ -59,34 +59,34 @@ namespace CORE { /** The normal behavior is to abort when an invalid expression * is constructed. This flag can be used to turn off this abort. * In any case, an error message will be printed */ -extern bool AbortFlag; +CGAL_CORE_EXPORT extern bool AbortFlag; /// Invalid Flag -- initiallly value is non-negative /** If the Abort Flag is false, then the Invalid flag will be set to * a negative value whenever an invalid expression is constructed. * It is the user's responsibility to check this flag and to make * it non-negative again. */ -extern int InvalidFlag; +CGAL_CORE_EXPORT extern int InvalidFlag; /// Escape Precision in bits -extern extLong EscapePrec; +CGAL_CORE_EXPORT extern extLong EscapePrec; /// current ur when EscapePrec triggered /** this flag becomes negative when default EscapePrec is applied */ -extern long EscapePrecFlag; +CGAL_CORE_EXPORT extern long EscapePrecFlag; /// Escape Precision Warning Flag /** this flag is true by default, and will cause a warning to be printed when EscapePrec is reached */ -extern bool EscapePrecWarning; +CGAL_CORE_EXPORT extern bool EscapePrecWarning; // These following two values determine the precision of computing // approximations in Expr. /// default Relative Precision in bits -extern extLong defRelPrec; +CGAL_CORE_EXPORT extern extLong defRelPrec; /// default Absolute Precision in bits -extern extLong defAbsPrec; +CGAL_CORE_EXPORT extern extLong defAbsPrec; /// default # of decimal digits for conversion from a BF to string. /** This value cannot be CORE_INFTY. @@ -96,42 +96,42 @@ extern extLong defAbsPrec; "controls the printout precision of std::cout for BigFloat" Perhaps, we should merge defOutputDigits and defBigFloatOutputDigits? */ -extern long defBigFloatOutputDigits; +CGAL_CORE_EXPORT extern long defBigFloatOutputDigits; /// default input precision in digits for converting a string to a Real or Expr /** This value can be CORE_INFTY */ -extern extLong defInputDigits; +CGAL_CORE_EXPORT extern extLong defInputDigits; /// controls the printout precision of std::cout for Real and Expr /** This value cannot be CORE_INFTY See also defBigFloatOutputDigits. (it really should be an int, as in std::cout.setprecision(int)). */ -extern long defOutputDigits; +CGAL_CORE_EXPORT extern long defOutputDigits; /// default input precision in digits for converting a string to a BigFloat /** This value cannot be CORE_INFTY. */ -extern long defBigFloatInputDigits; +CGAL_CORE_EXPORT extern long defBigFloatInputDigits; /// default BigFloat Division Relative Precision -extern extLong defBFdivRelPrec; +CGAL_CORE_EXPORT extern extLong defBFdivRelPrec; /// default BigFloat Sqrt Absolute Precision -extern extLong defBFsqrtAbsPrec; +CGAL_CORE_EXPORT extern extLong defBFsqrtAbsPrec; ////////////////////////////////////////////////////////////// // Mode parameters: incremental, progressive, filters ////////////////////////////////////////////////////////////// /// floating point filter flag -extern bool fpFilterFlag; +CGAL_CORE_EXPORT extern bool fpFilterFlag; /// if true, evaluation of expressions would be incremental -extern bool incrementalEvalFlag; +CGAL_CORE_EXPORT extern bool incrementalEvalFlag; /// progressive evaluation flag -extern bool progressiveEvalFlag; +CGAL_CORE_EXPORT extern bool progressiveEvalFlag; /// rational reduction flag -extern bool rationalReduceFlag; +CGAL_CORE_EXPORT extern bool rationalReduceFlag; /// default initial (bit) precision for AddSub Progressive Evaluation -extern long defInitialProgressivePrec; +CGAL_CORE_EXPORT extern long defInitialProgressivePrec; ////////////////////////////////////////////////////////////// // methods for setting global precision parameters diff --git a/Core/include/CGAL/CORE/Expr.h b/Core/include/CGAL/CORE/Expr.h index e71cd102e8a..c8fa2be7a75 100644 --- a/Core/include/CGAL/CORE/Expr.h +++ b/Core/include/CGAL/CORE/Expr.h @@ -45,6 +45,7 @@ namespace CORE { /// \class Expr Expr.h /// \brief Expr is a class of Expression in Level 3 typedef RCImpl RCExpr; + class Expr : public RCExpr { public: /// \name Constructors and Destructor @@ -258,7 +259,7 @@ public: /// convert to an interval defined by a pair of \c double /** If value is exact, the two \c double will coincide */ - void doubleInterval(double & lb, double & ub) const; + CGAL_CORE_EXPORT void doubleInterval(double & lb, double & ub) const; /// convert to \c BigInt (approximate it first!) BigInt BigIntValue() const { return rep->BigIntValue(); @@ -290,9 +291,10 @@ public: //@{ //CONSTANTS: /// return Expr(0) - static const Expr& getZero(); + CGAL_CORE_EXPORT static const Expr& getZero(); + /// return Expr(1) - static const Expr& getOne(); + CGAL_CORE_EXPORT static const Expr& getOne(); /// Has Exact Division static bool hasExactDivision() { @@ -359,9 +361,9 @@ inline std::istream& operator>>(std::istream& i, Expr& e) { } /// floor function -BigInt floor(const Expr&, Expr&); +CGAL_CORE_EXPORT BigInt floor(const Expr&, Expr&); /// power function -Expr pow(const Expr&, unsigned long); +CGAL_CORE_EXPORT Expr pow(const Expr&, unsigned long); /// addition inline Expr operator+(const Expr& e1, const Expr& e2) { diff --git a/Core/include/CGAL/CORE/ExprRep.h b/Core/include/CGAL/CORE/ExprRep.h index 49219da1223..7c6535ce55e 100644 --- a/Core/include/CGAL/CORE/ExprRep.h +++ b/Core/include/CGAL/CORE/ExprRep.h @@ -140,7 +140,7 @@ struct NodeInfo { BigRat* ratValue; ///< rational value /// default constructor - NodeInfo(); + CGAL_CORE_EXPORT NodeInfo(); };//NodeInfo struct // forward reference @@ -156,7 +156,7 @@ public: /// \name Constructor and Destructor //@{ /// default constructor - ExprRep(); + CGAL_CORE_EXPORT ExprRep(); /// virtual destructor for this base class virtual ~ExprRep() { if (nodeInfo != NULL) // This check is only for optimization. @@ -188,8 +188,8 @@ public: /// \name Helper Functions //@{ /// Get the approximate value - const Real & getAppValue(const extLong& relPrec = defRelPrec, - const extLong& absPrec = defAbsPrec); + CGAL_CORE_EXPORT const Real & getAppValue(const extLong& relPrec = defRelPrec, + const extLong& absPrec = defAbsPrec); /// Get the sign. int getSign(); int getExactSign(); @@ -424,23 +424,23 @@ public: /// compute the sign, uMSB, lMSB, etc. virtual void computeExactFlags() = 0; /// compute the minimal root bound - extLong computeBound(); + CGAL_CORE_EXPORT extLong computeBound(); /// driver function to approximate - void approx(const extLong& relPrec, const extLong& absPrec); + CGAL_CORE_EXPORT void approx(const extLong& relPrec, const extLong& absPrec); /// compute an approximate value satifying the specified precisions virtual void computeApproxValue(const extLong&, const extLong&) = 0; /// Test whether the current approx. value satisfies [relPrec, absPrec] - bool withinKnownPrecision(const extLong&, const extLong&); + CGAL_CORE_EXPORT bool withinKnownPrecision(const extLong&, const extLong&); //@} /// \name Misc Functions //@{ /// reduce current node - void reduceToBigRat(const BigRat&); + CGAL_CORE_EXPORT void reduceToBigRat(const BigRat&); /// reduce current node - void reduceTo(const ExprRep*); + CGAL_CORE_EXPORT void reduceTo(const ExprRep*); /// reduce current node to zero - void reduceToZero(); + CGAL_CORE_EXPORT void reduceToZero(); /// return operator string virtual const std::string op() const { return "UNKNOWN"; @@ -450,7 +450,7 @@ public: /// \name Degree Bound Functions //@{ /// compute "d_e" based on # of sqrts - extLong degreeBound(); + CGAL_CORE_EXPORT extLong degreeBound(); /// count actually computes the degree bound of current node. virtual extLong count() = 0; /// reset the flag "visited" @@ -477,20 +477,20 @@ public: /// \name Debug Functions //@{ /// print debug information in list mode - void debugList(int level, int depthLimit) const; + CGAL_CORE_EXPORT void debugList(int level, int depthLimit) const; /// print debug information in tree mode - void debugTree(int level, int indent, int depthLimit) const; + CGAL_CORE_EXPORT void debugTree(int level, int indent, int depthLimit) const; //@} protected: /// initialize nodeInfo - virtual void initNodeInfo(); + CGAL_CORE_EXPORT virtual void initNodeInfo(); /// return operator in string const std::string op() const { return "C"; } /// count returns the degree of current node //extLong count() { return d_e(); } - extLong count(); + CGAL_CORE_EXPORT extLong count(); /// clear visited flag void clearFlag() { visited() = false; @@ -519,9 +519,9 @@ public: CORE_MEMORY(ConstDoubleRep) protected: /// compute sign and MSB - void computeExactFlags(); + CGAL_CORE_EXPORT void computeExactFlags(); /// compute approximation value - void computeApproxValue(const extLong&, const extLong&); + CGAL_CORE_EXPORT void computeApproxValue(const extLong&, const extLong&); }; /// \class ConstRealRep @@ -533,7 +533,7 @@ public: /// default constructor ConstRealRep() : value(CORE_REAL_ZERO) { } /// constructor for all \c Real type - ConstRealRep(const Real &); + CGAL_CORE_EXPORT ConstRealRep(const Real &); /// destructor ~ConstRealRep() {} //@} @@ -714,16 +714,16 @@ public: /// \name Debug Functions //@{ /// print debug information in list mode - void debugList(int level, int depthLimit) const; + CGAL_CORE_EXPORT void debugList(int level, int depthLimit) const; /// print debug information in tree mode - void debugTree(int level, int indent, int depthLimit) const; + CGAL_CORE_EXPORT void debugTree(int level, int indent, int depthLimit) const; //@} protected: ExprRep* child; ///< pointer to its child node /// initialize nodeInfo - virtual void initNodeInfo(); + CGAL_CORE_EXPORT virtual void initNodeInfo(); /// clear visited flag - void clearFlag(); + CGAL_CORE_EXPORT void clearFlag(); #ifdef CORE_DEBUG unsigned long dagSize(); void fullClearFlag(); @@ -747,9 +747,9 @@ public: CORE_MEMORY(NegRep) protected: /// compute sign and MSB - void computeExactFlags(); + CGAL_CORE_EXPORT void computeExactFlags(); /// compute approximation value - void computeApproxValue(const extLong&, const extLong&); + CGAL_CORE_EXPORT void computeApproxValue(const extLong&, const extLong&); /// return operator in string const std::string op() const { return "Neg"; @@ -757,7 +757,7 @@ protected: /// count computes the degree of current node, i.e., d_e(). /** This is now a misnomer, but historically accurate. */ - extLong count(); + CGAL_CORE_EXPORT extLong count(); }; /// \class SqrtRep @@ -777,9 +777,9 @@ public: CORE_MEMORY(SqrtRep) protected: /// compute sign and MSB - void computeExactFlags(); + CGAL_CORE_EXPORT void computeExactFlags(); /// compute approximation value - void computeApproxValue(const extLong&, const extLong&); + CGAL_CORE_EXPORT void computeApproxValue(const extLong&, const extLong&); /// return operator in string const std::string op() const { return "Sqrt"; @@ -787,7 +787,7 @@ protected: /// count computes the degree of current node, i.e., d_e(). /** This is now a misnomer, but historically accurate. */ - extLong count(); + CGAL_CORE_EXPORT extLong count(); }; /// \class BinOpRep @@ -811,25 +811,25 @@ public: /// \name Debug Functions //@{ /// print debug information in list mode - void debugList(int level, int depthLimit) const; + CGAL_CORE_EXPORT void debugList(int level, int depthLimit) const; /// print debug information in tree mode - void debugTree(int level, int indent, int depthLimit) const; + CGAL_CORE_EXPORT void debugTree(int level, int indent, int depthLimit) const; //@} protected: ExprRep* first; ///< first operand ExprRep* second; ///< second operand /// initialize nodeInfo - virtual void initNodeInfo(); + CGAL_CORE_EXPORT virtual void initNodeInfo(); /// clear visited flags - void clearFlag(); + CGAL_CORE_EXPORT void clearFlag(); /// count computes the degree of current node, i.e., d_e(). /** This is now a misnomer, but historically accurate. */ - extLong count(); + CGAL_CORE_EXPORT extLong count(); #ifdef CORE_DEBUG - unsigned long dagSize(); - void fullClearFlag(); + CGAL_CORE_EXPORT unsigned long dagSize(); + CGAL_CORE_EXPORT void fullClearFlag(); #endif }; @@ -837,7 +837,7 @@ protected: /// \brief "functor" class used as parameter to AddSubRep<> struct Add { /// name - static const char* name; + CGAL_CORE_EXPORT static const char* name; /// unary operator template @@ -856,7 +856,7 @@ struct Add { /// \brief "functor" class used as parameter to AddSubRep<> struct Sub { /// name - static const char* name; + CGAL_CORE_EXPORT static const char* name; /// unary operator template @@ -889,9 +889,9 @@ public: CORE_MEMORY(AddSubRep) protected: /// compute sign and MSB - void computeExactFlags(); + void computeExactFlags(); /// compute approximation value - void computeApproxValue(const extLong&, const extLong&); + void computeApproxValue(const extLong&, const extLong&); /// return operator in string const std::string op() const { return Operator::name; @@ -1232,13 +1232,13 @@ public: /// destructor ~MultRep() {} //@} - + CORE_MEMORY(MultRep) -protected: + protected: /// compute sign and MSB - void computeExactFlags(); + CGAL_CORE_EXPORT void computeExactFlags(); /// compute approximation value - void computeApproxValue(const extLong&, const extLong&); + CGAL_CORE_EXPORT void computeApproxValue(const extLong&, const extLong&); /// return operator in string const std::string op() const { return "*"; @@ -1262,9 +1262,9 @@ public: CORE_MEMORY(DivRep) protected: /// compute sign and MSB - void computeExactFlags(); + CGAL_CORE_EXPORT void computeExactFlags(); /// compute approximation value - void computeApproxValue(const extLong&, const extLong&); + CGAL_CORE_EXPORT void computeApproxValue(const extLong&, const extLong&); /// return operator in string const std::string op() const { return "/"; diff --git a/Core/include/CGAL/CORE/Gmp.h b/Core/include/CGAL/CORE/Gmp.h index e9b46196e58..df5194bbd06 100644 --- a/Core/include/CGAL/CORE/Gmp.h +++ b/Core/include/CGAL/CORE/Gmp.h @@ -7,10 +7,10 @@ namespace CORE { -std::ostream& io_write (std::ostream &, mpz_srcptr); -std::ostream& io_write (std::ostream &, mpq_srcptr); -std::istream& io_read (std::istream &, mpz_ptr); -std::istream& io_read (std::istream &, mpq_ptr); +CGAL_CORE_EXPORT std::ostream& io_write (std::ostream &, mpz_srcptr); +CGAL_CORE_EXPORT std::ostream& io_write (std::ostream &, mpq_srcptr); +CGAL_CORE_EXPORT std::istream& io_read (std::istream &, mpz_ptr); +CGAL_CORE_EXPORT std::istream& io_read (std::istream &, mpq_ptr); //std::ostream& operator<< (std::ostream &, mpz_srcptr); //std::ostream& operator<< (std::ostream &, mpq_srcptr); //std::istream& operator>> (std::istream &, mpz_ptr); diff --git a/Core/include/CGAL/CORE/Real.h b/Core/include/CGAL/CORE/Real.h index 75102a1254e..f9df7338172 100644 --- a/Core/include/CGAL/CORE/Real.h +++ b/Core/include/CGAL/CORE/Real.h @@ -270,9 +270,9 @@ public: //@} /// return Real(0) - static const Real& getZero(); + CGAL_CORE_EXPORT static const Real& getZero(); private: - void constructFromString(const char *str, const extLong& prec); + CGAL_CORE_EXPORT void constructFromString(const char *str, const extLong& prec); }; #define CORE_REAL_ZERO Real::getZero() @@ -375,7 +375,8 @@ struct real_div { } }; -std::istream& operator>>(std::istream& i, Real& r); +CGAL_CORE_EXPORT std::istream& operator>>(std::istream& i, Real& r); + inline std::ostream& operator<<(std::ostream& o, const Real& r) { return r.getRep().operator<<(o); } @@ -441,9 +442,9 @@ inline bool operator<(const Real& x, const Real& y) { } /// floor function -BigInt floor(const Real&, Real&); +CGAL_CORE_EXPORT BigInt floor(const Real&, Real&); /// power function -Real pow(const Real&, unsigned long); +CGAL_CORE_EXPORT Real pow(const Real&, unsigned long); /// return sign inline int sign(const Real& r) { diff --git a/Core/include/CGAL/CORE/RefCount.h b/Core/include/CGAL/CORE/RefCount.h index df87a0756b0..8330b297727 100644 --- a/Core/include/CGAL/CORE/RefCount.h +++ b/Core/include/CGAL/CORE/RefCount.h @@ -94,14 +94,17 @@ public: T& getRep() { return *rep; } + + /// clone data void makeCopy() { if (rep->getRefCount() > 1) { T* oldValue = rep; rep->decRef(); // safe since rep has been referred at least once. - rep = oldValue ? new T(*oldValue) : 0; + rep = oldValue ? new T(*oldValue) : 0; } } + #ifdef CORE_RC_DEBUG /// get counter int getRefCount() const { diff --git a/Core/include/CGAL/CORE/export.h b/Core/include/CGAL/CORE/export.h new file mode 100755 index 00000000000..373a2147460 --- /dev/null +++ b/Core/include/CGAL/CORE/export.h @@ -0,0 +1,24 @@ +#ifndef CGAL_CORE_EXPORT_H +#define CGAL_CORE_EXPORT_H + +#include + +#if defined(BOOST_MSVC) && ( ! defined(CGAL_EXPORTS) ) + +#if defined(CGAL_Core_EXPORTS) // add by CMake or in cpp files of the dll +#define CGAL_CORE_EXPORT __declspec (dllexport) +#define CGAL_CORE_EXPIMP_TEMPLATE +#else +#define CGAL_CORE_EXPORT __declspec (dllimport) +#define CGAL_CORE_EXPIMP_TEMPLATE extern +#endif + +#else + +#define CGAL_CORE_EXPORT +#define CGAL_CORE_EXPIMP_TEMPLATE +#endif + +#endif // CGAL_CORE_EXPORT_H + + diff --git a/Core/include/CGAL/CORE/extLong.h b/Core/include/CGAL/CORE/extLong.h index 2423f1295b2..08d546afe26 100644 --- a/Core/include/CGAL/CORE/extLong.h +++ b/Core/include/CGAL/CORE/extLong.h @@ -59,7 +59,7 @@ const unsigned long U_EXTLONG_MAX = LONG_MAX; /// \class extLong /// \brief extended long integer -class extLong { +class CGAL_CORE_EXPORT extLong { private: long val; ///< internal representation int flag; ///< flags @@ -128,7 +128,7 @@ public: /// \name I/O Stream ///@{ - friend std::ostream& operator <<(std::ostream&, const extLong&); + friend CGAL_CORE_EXPORT std::ostream& operator <<(std::ostream&, const extLong&); //@} static const extLong& getNaNLong(); @@ -136,6 +136,8 @@ public: static const extLong& getNegInfty(); }; + + // constants (Globally) #define CORE_NaNLong extLong::getNaNLong() #define CORE_posInfty extLong::getPosInfty() diff --git a/Installation/CMakeLists.txt b/Installation/CMakeLists.txt index 3538ddf4246..9fbc0c8323e 100644 --- a/Installation/CMakeLists.txt +++ b/Installation/CMakeLists.txt @@ -529,6 +529,7 @@ set ( CGAL_INSTALL_MAN_DIR "share/man/man1" #-------------------------------------------------------------------------------------------------- set(CGAL_LIBRARIES_DIR ${CMAKE_BINARY_DIR}/lib) +message(STATUS "CGAL_LIBRARIES_DIR=${CGAL_LIBRARIES_DIR}") set(LIBRARY_OUTPUT_PATH ${CGAL_LIBRARIES_DIR}) diff --git a/Installation/cmake/modules/CGAL_Common.cmake b/Installation/cmake/modules/CGAL_Common.cmake index 7aacd7846cb..534c475a2f2 100644 --- a/Installation/cmake/modules/CGAL_Common.cmake +++ b/Installation/cmake/modules/CGAL_Common.cmake @@ -30,11 +30,7 @@ if( NOT CGAL_COMMON_FILE_INCLUDED ) endif() if ( "${BUILD_SHARED_LIBS}" STREQUAL "" ) - if ( WIN32 ) - set(BUILD_SHARED_LIBS OFF) - else() - set(BUILD_SHARED_LIBS ON) - endif() + set(BUILD_SHARED_LIBS ON) endif() if ( CGAL_BUILDING_LIBS ) diff --git a/Installation/cmake/modules/CGAL_SetupBoost.cmake b/Installation/cmake/modules/CGAL_SetupBoost.cmake index 2e173c0cd42..164dca9027a 100644 --- a/Installation/cmake/modules/CGAL_SetupBoost.cmake +++ b/Installation/cmake/modules/CGAL_SetupBoost.cmake @@ -1,8 +1,9 @@ if ( NOT CGAL_Boost_Setup ) - - if ( NOT BUILD_SHARED_LIBS ) + +# AF: FIX THIS +# if ( NOT BUILD_SHARED_LIBS ) set(Boost_USE_STATIC_LIBS ON) - endif() +# endif() set(Boost_FIND_VERSION 1.33.1 ) set(Boost_FIND_VERSION_MAJOR 1 ) diff --git a/Installation/include/CGAL/auto_link/CORE.h b/Installation/include/CGAL/auto_link/CORE.h index 38141bf791f..0c4ebfef034 100644 --- a/Installation/include/CGAL/auto_link/CORE.h +++ b/Installation/include/CGAL/auto_link/CORE.h @@ -21,7 +21,8 @@ #define CGAL_AUTO_LINK_CORE_H #ifndef CGAL_NO_AUTOLINK_CORE -#ifndef CGAL_EXPORTS +#if ( ! defined( CGAL_EXPORTS ) ) && (! defined ( CGAL_Core_EXPORTS ) ) + // If CGAL_EXPORTS is defined it means that we are building the CGAL // library as a DLL. The CGAL.dll does not really depend on CGAL_Core, // whatever the header inclusion graph says. diff --git a/Installation/include/CGAL/config.h b/Installation/include/CGAL/config.h index 627c57f4f84..2144bcb0ff2 100644 --- a/Installation/include/CGAL/config.h +++ b/Installation/include/CGAL/config.h @@ -39,6 +39,8 @@ #include +#include + //----------------------------------------------------------------------// // platform specific workaround flags (CGAL_CFG_...) //----------------------------------------------------------------------// diff --git a/Installation/include/CGAL/export.h b/Installation/include/CGAL/export.h new file mode 100755 index 00000000000..741bc68dfb1 --- /dev/null +++ b/Installation/include/CGAL/export.h @@ -0,0 +1,24 @@ +#ifndef CGAL_EXPORT_H +#define CGAL_EXPORT_H + +#include + +#if defined(BOOST_MSVC) + +#if defined(CGAL_EXPORTS) // add by CMake or in cpp files of the dll +#define CGAL_EXPORT __declspec (dllexport) +#define CGAL_EXPIMP_TEMPLATE +#else +#define CGAL_EXPORT __declspec (dllimport) +#define CGAL_EXPIMP_TEMPLATE extern +#endif + +#else + +#define CGAL_EXPORT +#define CGAL_EXPIMP_TEMPLATE +#endif + +#endif // CGAL_EXPORT_H + + diff --git a/Installation/src/CGAL/CMakeLists.txt b/Installation/src/CGAL/CMakeLists.txt index 04d8e51a622..a0ee1aa4623 100644 --- a/Installation/src/CGAL/CMakeLists.txt +++ b/Installation/src/CGAL/CMakeLists.txt @@ -1,11 +1,12 @@ -build_cgal_library(CGAL CGAL "") - include_directories (${CGAL_3RD_PARTY_INCLUDE_DIRS}) add_definitions(${CGAL_3RD_PARTY_DEFINITIONS}) +message("CGAL_3RD_PARTY_LIBRARIES_DIRS=${CGAL_3RD_PARTY_LIBRARIES_DIRS}") link_directories(${CGAL_3RD_PARTY_LIBRARIES_DIRS}) +build_cgal_library(CGAL CGAL "") + target_link_libraries(CGAL ${CGAL_3RD_PARTY_LIBRARIES}) set( CGAL_BASENAME CGAL ) diff --git a/Installation/src/CMakeLists.txt b/Installation/src/CMakeLists.txt index cec8c05cd60..3e6cc980524 100644 --- a/Installation/src/CMakeLists.txt +++ b/Installation/src/CMakeLists.txt @@ -24,7 +24,6 @@ macro (build_cgal_library LIBRARY_NAME LIBRARY_DIR_NAME ADDITIONAL_FILES) # message(STATUS "Additional files: ${ADDITIONAL_FILES}") add_library (${LIBRARY_NAME} ${CMAKE_CURRENT_BINARY_DIR}/all_files.cpp ${ADDITIONAL_FILES}) # add_library (${LIBRARY_NAME} ${CGAL_LIBRARY_SOURCE_FILES} ${ADDITIONAL_FILES}) # builing not creating temporary all_files.cpp - endmacro() macro( configure_component DIR COMPONENT ) diff --git a/Intersections_2/include/CGAL/Bbox_2_Line_2_intersection.h b/Intersections_2/include/CGAL/Bbox_2_Line_2_intersection.h index fab3506c262..5d0204680d6 100644 --- a/Intersections_2/include/CGAL/Bbox_2_Line_2_intersection.h +++ b/Intersections_2/include/CGAL/Bbox_2_Line_2_intersection.h @@ -37,7 +37,7 @@ namespace CGAL { class Bbox_2_Line_2_pair_impl; -class Bbox_2_Line_2_pair { +class CGAL_EXPORT Bbox_2_Line_2_pair { public: enum Intersection_results {NO_INTERSECTION, POINT, SEGMENT}; Bbox_2_Line_2_pair() ; diff --git a/Intersections_2/include/CGAL/Ray_2_Bbox_2_intersection.h b/Intersections_2/include/CGAL/Ray_2_Bbox_2_intersection.h index 0211c052310..aea1bd5cd33 100644 --- a/Intersections_2/include/CGAL/Ray_2_Bbox_2_intersection.h +++ b/Intersections_2/include/CGAL/Ray_2_Bbox_2_intersection.h @@ -35,7 +35,7 @@ namespace CGAL { class Bbox_2_Ray_2_pair_impl; -class Bbox_2_Ray_2_pair { +class CGAL_EXPORT Bbox_2_Ray_2_pair { public: enum Intersection_results {NO_INTERSECTION, POINT, SEGMENT}; ~Bbox_2_Ray_2_pair() ; @@ -51,7 +51,7 @@ protected: Bbox_2_Ray_2_pair_impl *pimpl; }; -bool do_intersect_ray_2( +CGAL_EXPORT bool do_intersect_ray_2( const Bbox_2 &box, double x, double y, double dx, double dy); template diff --git a/Kernel_23/include/CGAL/Origin.h b/Kernel_23/include/CGAL/Origin.h index 2bc90425066..af056719cf2 100644 --- a/Kernel_23/include/CGAL/Origin.h +++ b/Kernel_23/include/CGAL/Origin.h @@ -33,12 +33,12 @@ namespace CGAL { class Origin {}; -extern const Origin ORIGIN; +CGAL_EXPORT extern const Origin ORIGIN; class Null_vector {}; -extern const Null_vector NULL_VECTOR; +CGAL_EXPORT extern const Null_vector NULL_VECTOR; } //namespace CGAL diff --git a/Kernel_23/include/CGAL/aff_transformation_tags.h b/Kernel_23/include/CGAL/aff_transformation_tags.h index 74d21996ca2..0b799438394 100644 --- a/Kernel_23/include/CGAL/aff_transformation_tags.h +++ b/Kernel_23/include/CGAL/aff_transformation_tags.h @@ -36,11 +36,11 @@ class Scaling {}; class Reflection {}; class Identity_transformation {}; -extern Translation TRANSLATION; -extern Rotation ROTATION; -extern Scaling SCALING; -extern Reflection REFLECTION; -extern Identity_transformation IDENTITY; +CGAL_EXPORT extern Translation TRANSLATION; +CGAL_EXPORT extern Rotation ROTATION; +CGAL_EXPORT extern Scaling SCALING; +CGAL_EXPORT extern Reflection REFLECTION; +CGAL_EXPORT extern Identity_transformation IDENTITY; } //namespace CGAL diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/internal/debug_counters.h b/Kinetic_data_structures/include/CGAL/Kinetic/internal/debug_counters.h index d6cfbc57109..5e9ed05c563 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/internal/debug_counters.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/internal/debug_counters.h @@ -22,11 +22,11 @@ namespace CGAL { namespace Kinetic { namespace internal { - extern unsigned int zero_certificates__; - extern unsigned int function_degeneracies__; - extern unsigned int io_errors__; - extern unsigned int audit_failures__; + CGAL_EXPORT extern unsigned int zero_certificates__; + CGAL_EXPORT extern unsigned int function_degeneracies__; + CGAL_EXPORT extern unsigned int io_errors__; + CGAL_EXPORT extern unsigned int audit_failures__; - void write_debug_counters(std::ostream &out); + CGAL_EXPORT void write_debug_counters(std::ostream &out); } } } //namespace CGAL::Kinetic diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/numeric_solvers.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/numeric_solvers.h index 40cc63a5f28..f558c98879a 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/numeric_solvers.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/numeric_solvers.h @@ -26,23 +26,29 @@ namespace CGAL { namespace POLYNOMIAL { namespace internal { // JAMA +CGAL_EXPORT void jama_polynomial_compute_roots(const double *begin, const double *end, double lb, double ub, std::vector &roots); +CGAL_EXPORT void jama_polynomial_compute_cleaned_roots(const double *begin, const double *end, double lb, double ub, std::vector &roots); // GSL +CGAL_EXPORT void gsl_polynomial_compute_roots(const double *begin, const double *end, double lb, double ub, std::vector &roots); +CGAL_EXPORT void gsl_polynomial_compute_cleaned_roots(const double *begin, const double *end, double lb, double ub, std::vector &roots); // Turkowski +CGAL_EXPORT void Turkowski_polynomial_compute_roots(const double *begin, const double *end, double lb, double ub, std::vector &roots); +CGAL_EXPORT void Turkowski_polynomial_compute_cleaned_roots(const double *begin, const double *end, double lb, double ub, std::vector &roots); diff --git a/Modular_arithmetic/include/CGAL/Modular_arithmetic/Residue_type.h b/Modular_arithmetic/include/CGAL/Modular_arithmetic/Residue_type.h index aa420e8f559..413513cb659 100644 --- a/Modular_arithmetic/include/CGAL/Modular_arithmetic/Residue_type.h +++ b/Modular_arithmetic/include/CGAL/Modular_arithmetic/Residue_type.h @@ -56,16 +56,16 @@ class Residue: boost::ordered_field_operators2< Residue, int > >{ public: - typedef Residue Self; - typedef Residue NT; - + typedef Residue Self; + typedef Residue NT; + private: - static const double CST_CUT; - + CGAL_EXPORT static const double CST_CUT; + #ifdef CGAL_HAS_THREADS - static boost::thread_specific_ptr prime_int_; - static boost::thread_specific_ptr prime_; - static boost::thread_specific_ptr prime_inv_; + CGAL_EXPORT static boost::thread_specific_ptr prime_int_; + CGAL_EXPORT static boost::thread_specific_ptr prime_; + CGAL_EXPORT static boost::thread_specific_ptr prime_inv_; static void init_class_for_thread(){ CGAL_precondition(prime_int_.get() == NULL); @@ -94,9 +94,9 @@ private: return *prime_inv_.get(); } #else - static int prime_int; - static double prime; - static double prime_inv; + CGAL_EXPORT static int prime_int; + CGAL_EXPORT static double prime; + CGAL_EXPORT static double prime_inv; static int get_prime_int(){ return prime_int;} static double get_prime() { return prime;} static double get_prime_inv(){ return prime_inv;} diff --git a/Modular_arithmetic/include/CGAL/primes.h b/Modular_arithmetic/include/CGAL/primes.h index 0e2baefe92f..49d00e0071a 100644 --- a/Modular_arithmetic/include/CGAL/primes.h +++ b/Modular_arithmetic/include/CGAL/primes.h @@ -27,7 +27,7 @@ namespace CGAL { namespace internal { -extern int primes[2000]; +CGAL_EXPORT extern int primes[2000]; static inline int get_next_lower_prime(int current_prime){ diff --git a/Nef_2/include/CGAL/Nef_2/Polynomial.h b/Nef_2/include/CGAL/Nef_2/Polynomial.h index 4195888f9d7..1246dc1a903 100644 --- a/Nef_2/include/CGAL/Nef_2/Polynomial.h +++ b/Nef_2/include/CGAL/Nef_2/Polynomial.h @@ -735,14 +735,14 @@ class Polynomial : /*{\Xtext \headerline{Static member functions}}*/ - static Polynomial gcd + CGAL_EXPORT static Polynomial gcd (const Polynomial& p1, const Polynomial& p2); /*{\Xstatic returns the greatest common divisor of |p1| and |p2|. \textbf{Note} that |int=int| quickly leads to overflow errors when using this operation. \precond Requires |int| to be a unique factorization domain, i.e. to provide a |gcd| operation.}*/ - static void pseudo_div + CGAL_EXPORT static void pseudo_div (const Polynomial& f, const Polynomial& g, Polynomial& q, Polynomial& r, int& D); /*{\Xstatic implements division with remainder on polynomials of @@ -750,7 +750,7 @@ class Polynomial : factorization domain, i.e., there exists a |gcd| operation and an integral division operation on |int|.}*/ - static void euclidean_div + CGAL_EXPORT static void euclidean_div (const Polynomial& f, const Polynomial& g, Polynomial& q, Polynomial& r); /*{\Xstatic implements division with remainder on polynomials of @@ -1037,14 +1037,14 @@ determines the sign for the limit process $x \rightarrow \infty$. /*{\Xtext \headerline{Static member functions}}*/ - static Polynomial gcd + CGAL_EXPORT static Polynomial gcd (const Polynomial& p1, const Polynomial& p2); /*{\Xstatic returns the greatest common divisor of |p1| and |p2|. \textbf{Note} that |double=int| quickly leads to overflow errors when using this operation. \precond Requires |double| to be a unique factorization domain, i.e. to provide a |gdc| operation.}*/ - static void pseudo_div + CGAL_EXPORT static void pseudo_div (const Polynomial& f, const Polynomial& g, Polynomial& q, Polynomial& r, double& D); /*{\Xstatic implements division with remainder on polynomials of @@ -1052,7 +1052,7 @@ determines the sign for the limit process $x \rightarrow \infty$. factorization domain, i.e., there exists a |gcd| operation and an integral division operation on |double|.}*/ - static void euclidean_div + CGAL_EXPORT static void euclidean_div (const Polynomial& f, const Polynomial& g, Polynomial& q, Polynomial& r); /*{\Xstatic implements division with remainder on polynomials of diff --git a/Number_types/include/CGAL/FPU.h b/Number_types/include/CGAL/FPU.h index af074d3fd70..e3b574b96e9 100644 --- a/Number_types/include/CGAL/FPU.h +++ b/Number_types/include/CGAL/FPU.h @@ -109,7 +109,7 @@ namespace CGAL { namespace internal { #ifdef CGAL_CFG_DENORMALS_COMPILE_BUG -extern double minimin; +CGAL_EXPORT extern double minimin; #endif #ifdef __INTEL_COMPILER diff --git a/Number_types/include/CGAL/MP_Float.h b/Number_types/include/CGAL/MP_Float.h index 1ed2ceb7ce3..fd7ecc7eed2 100644 --- a/Number_types/include/CGAL/MP_Float.h +++ b/Number_types/include/CGAL/MP_Float.h @@ -65,43 +65,76 @@ class MP_Float; template < typename > class Quotient; // Needed for overloaded To_double namespace INTERN_MP_FLOAT { + +CGAL_EXPORT Comparison_result compare(const MP_Float&, const MP_Float&); + +CGAL_EXPORT MP_Float square(const MP_Float&); // to_double() returns, not the closest double, but a one bit error is allowed. // We guarantee : to_double(MP_Float(double d)) == d. +CGAL_EXPORT double to_double(const MP_Float&); +CGAL_EXPORT double to_double(const Quotient&); + +CGAL_EXPORT std::pair to_interval(const MP_Float &); + +CGAL_EXPORT std::pair to_interval(const Quotient&); + +CGAL_EXPORT MP_Float div(const MP_Float& n1, const MP_Float& n2); + +CGAL_EXPORT MP_Float gcd(const MP_Float& a, const MP_Float& b); } //namespace INTERN_MP_FLOAT +CGAL_EXPORT std::pair to_double_exp(const MP_Float &b); // Returns (first * 2^second), an interval surrounding b. +CGAL_EXPORT std::pair, int> to_interval_exp(const MP_Float &b); +CGAL_EXPORT std::ostream & operator<< (std::ostream & os, const MP_Float &b); // This one is for debug. +CGAL_EXPORT std::ostream & print (std::ostream & os, const MP_Float &b); +CGAL_EXPORT std::istream & operator>> (std::istream & is, MP_Float &b); +CGAL_EXPORT MP_Float operator+(const MP_Float &a, const MP_Float &b); + +CGAL_EXPORT MP_Float operator-(const MP_Float &a, const MP_Float &b); + +CGAL_EXPORT MP_Float operator*(const MP_Float &a, const MP_Float &b); + +CGAL_EXPORT MP_Float operator%(const MP_Float &a, const MP_Float &b); -class MP_Float +// We have to export the instantianted vector class +// as it is used in inlined functions defined in the MP_Float.h file + +// short == MP_Float::limb +CGAL_EXPIMP_TEMPLATE template class CGAL_EXPORT std::allocator; +CGAL_EXPIMP_TEMPLATE template class CGAL_EXPORT std::vector; + +class CGAL_EXPORT MP_Float { public: typedef short limb; @@ -385,9 +418,11 @@ inline bool operator!=(const MP_Float &a, const MP_Float &b) { return ! (a == b); } +CGAL_EXPORT MP_Float approximate_sqrt(const MP_Float &d); +CGAL_EXPORT MP_Float approximate_division(const MP_Float &n, const MP_Float &d); diff --git a/Profiling_tools/include/CGAL/Real_timer.h b/Profiling_tools/include/CGAL/Real_timer.h index 7527cb22509..2bd3e734857 100644 --- a/Profiling_tools/include/CGAL/Real_timer.h +++ b/Profiling_tools/include/CGAL/Real_timer.h @@ -43,7 +43,7 @@ namespace CGAL { // or last reset. It counts only the time where it is in the running // state. The time information is given in seconds. -class Real_timer { +class CGAL_EXPORT Real_timer { private: double elapsed; double started; diff --git a/Profiling_tools/include/CGAL/Timer.h b/Profiling_tools/include/CGAL/Timer.h index 69beb7ac15e..b4d3ee7a37d 100644 --- a/Profiling_tools/include/CGAL/Timer.h +++ b/Profiling_tools/include/CGAL/Timer.h @@ -41,7 +41,7 @@ namespace CGAL { // or last reset. It counts only the time where it is in the running // state. The time information is given in seconds. -class Timer { +class CGAL_EXPORT Timer { private: double elapsed; double started; diff --git a/Random_numbers/include/CGAL/Random.h b/Random_numbers/include/CGAL/Random.h index eb3a27340fe..e9ae8aa9df5 100644 --- a/Random_numbers/include/CGAL/Random.h +++ b/Random_numbers/include/CGAL/Random.h @@ -40,32 +40,32 @@ namespace CGAL { class Random { - public: - // types - - struct State { +public: + // types + + struct State { std::string rng; unsigned int random_value, val, seed; - + State() {} - + State(std::string rng, unsigned int random_value, unsigned int val, unsigned int seed) : rng(rng), random_value(random_value), val(val), seed(seed) {} - }; - // creation - Random( ); - Random( unsigned int seed); - - // seed - unsigned int get_seed ( ) const; + }; + // creation + CGAL_EXPORT Random( ); + CGAL_EXPORT Random( unsigned int seed); + + // seed + CGAL_EXPORT unsigned int get_seed ( ) const; - // operations - bool get_bool( ) + // operations + bool get_bool( ) { return( static_cast< bool>( rng() & 1)); } @@ -224,7 +224,7 @@ class Random { // Global variables // ================ -extern Random default_random; +CGAL_EXPORT extern Random default_random; } //namespace CGAL diff --git a/STL_Extension/include/CGAL/assertions.h b/STL_Extension/include/CGAL/assertions.h index 4a1fa738ca4..49ec2c47c2c 100644 --- a/STL_Extension/include/CGAL/assertions.h +++ b/STL_Extension/include/CGAL/assertions.h @@ -41,12 +41,13 @@ namespace CGAL { // ===================== // failure functions // ----------------- -void assertion_fail ( const char*, const char*, int, const char* = "") CGAL_NORETURN; -void precondition_fail ( const char*, const char*, int, const char* = "") CGAL_NORETURN; -void postcondition_fail ( const char*, const char*, int, const char* = "") CGAL_NORETURN; +CGAL_EXPORT void assertion_fail ( const char*, const char*, int, const char* = "") CGAL_NORETURN; +CGAL_EXPORT void precondition_fail ( const char*, const char*, int, const char* = "") CGAL_NORETURN; +CGAL_EXPORT void postcondition_fail ( const char*, const char*, int, const char* = "") CGAL_NORETURN; // warning function // ---------------- +CGAL_EXPORT void warning_fail( const char*, const char*, int, const char* = ""); diff --git a/STL_Extension/include/CGAL/assertions_behaviour.h b/STL_Extension/include/CGAL/assertions_behaviour.h index fe1fc90cf1d..03593a7a15f 100644 --- a/STL_Extension/include/CGAL/assertions_behaviour.h +++ b/STL_Extension/include/CGAL/assertions_behaviour.h @@ -41,17 +41,21 @@ typedef (*Failure_function)( const char*, const char*, const char*, int, const char*); +CGAL_EXPORT Failure_function set_error_handler( Failure_function handler); +CGAL_EXPORT Failure_function set_warning_handler( Failure_function handler); // failure behaviour handler // ------------------------- +CGAL_EXPORT Failure_behaviour set_error_behaviour(Failure_behaviour eb); +CGAL_EXPORT Failure_behaviour set_warning_behaviour(Failure_behaviour eb); diff --git a/Stream_support/include/CGAL/IO/File_header_OFF.h b/Stream_support/include/CGAL/IO/File_header_OFF.h index 95fbb998f19..117f0551fef 100644 --- a/Stream_support/include/CGAL/IO/File_header_OFF.h +++ b/Stream_support/include/CGAL/IO/File_header_OFF.h @@ -33,7 +33,7 @@ namespace CGAL { // Info structure for OFF file headers // =================================== -class File_header_OFF : public File_header_extended_OFF { +class CGAL_EXPORT File_header_OFF : public File_header_extended_OFF { private: // Publicly accessible file informations. std::size_t n_vertices; diff --git a/Stream_support/include/CGAL/IO/File_header_extended_OFF.h b/Stream_support/include/CGAL/IO/File_header_extended_OFF.h index c9b4a30ddce..9a4527d8613 100644 --- a/Stream_support/include/CGAL/IO/File_header_extended_OFF.h +++ b/Stream_support/include/CGAL/IO/File_header_extended_OFF.h @@ -33,7 +33,7 @@ namespace CGAL { -class File_header_extended_OFF { +class CGAL_EXPORT File_header_extended_OFF { bool m_verbose; // Print error messages if true. bool m_polyhedral_surface; std::size_t m_halfedges; diff --git a/Stream_support/include/CGAL/IO/File_scanner_OFF.h b/Stream_support/include/CGAL/IO/File_scanner_OFF.h index 3e93d45192f..c5a5536f6e5 100644 --- a/Stream_support/include/CGAL/IO/File_scanner_OFF.h +++ b/Stream_support/include/CGAL/IO/File_scanner_OFF.h @@ -37,7 +37,7 @@ namespace CGAL { -class File_scanner_OFF : public File_header_OFF { +class CGAL_EXPORT File_scanner_OFF : public File_header_OFF { std::istream& m_in; bool normals_read; void skip_comment() { m_in >> skip_comment_OFF; } diff --git a/Stream_support/include/CGAL/IO/File_writer_OFF.h b/Stream_support/include/CGAL/IO/File_writer_OFF.h index 0114352d626..9117f5a0b5c 100644 --- a/Stream_support/include/CGAL/IO/File_writer_OFF.h +++ b/Stream_support/include/CGAL/IO/File_writer_OFF.h @@ -32,7 +32,7 @@ namespace CGAL { -class File_writer_OFF { +class CGAL_EXPORT File_writer_OFF { std::ostream* m_out; File_header_OFF m_header; public: diff --git a/Stream_support/include/CGAL/IO/File_writer_VRML_2.h b/Stream_support/include/CGAL/IO/File_writer_VRML_2.h index cc158f27e53..c066a0fc3e2 100644 --- a/Stream_support/include/CGAL/IO/File_writer_VRML_2.h +++ b/Stream_support/include/CGAL/IO/File_writer_VRML_2.h @@ -31,7 +31,7 @@ namespace CGAL { -class File_writer_VRML_2 { +class CGAL_EXPORT File_writer_VRML_2 { std::ostream* m_out; std::size_t m_facets; public: diff --git a/Stream_support/include/CGAL/IO/File_writer_inventor.h b/Stream_support/include/CGAL/IO/File_writer_inventor.h index 97fb8e9135c..91e1bc02e22 100644 --- a/Stream_support/include/CGAL/IO/File_writer_inventor.h +++ b/Stream_support/include/CGAL/IO/File_writer_inventor.h @@ -31,7 +31,7 @@ namespace CGAL { -class File_writer_inventor { +class CGAL_EXPORT File_writer_inventor { std::ostream* m_out; std::size_t m_facets; public: diff --git a/Stream_support/include/CGAL/IO/File_writer_wavefront.h b/Stream_support/include/CGAL/IO/File_writer_wavefront.h index 9f8d93bce59..c52032c8680 100644 --- a/Stream_support/include/CGAL/IO/File_writer_wavefront.h +++ b/Stream_support/include/CGAL/IO/File_writer_wavefront.h @@ -31,7 +31,7 @@ namespace CGAL { -class File_writer_wavefront { +class CGAL_EXPORT File_writer_wavefront { std::ostream* m_out; std::size_t m_facets; public: diff --git a/iostream/include/CGAL/IO/Color.h b/iostream/include/CGAL/IO/Color.h index 27d0e619f6f..33cd8980402 100644 --- a/iostream/include/CGAL/IO/Color.h +++ b/iostream/include/CGAL/IO/Color.h @@ -77,20 +77,20 @@ private: }; -extern const Color BLACK ; -extern const Color WHITE ; -extern const Color GRAY ; +CGAL_EXPORT extern const Color BLACK ; +CGAL_EXPORT extern const Color WHITE ; +CGAL_EXPORT extern const Color GRAY ; -extern const Color RED ; -extern const Color GREEN ; +CGAL_EXPORT extern const Color RED ; +CGAL_EXPORT extern const Color GREEN ; -extern const Color DEEPBLUE ; -extern const Color BLUE ; -extern const Color PURPLE ; -extern const Color VIOLET ; +CGAL_EXPORT extern const Color DEEPBLUE ; +CGAL_EXPORT extern const Color BLUE ; +CGAL_EXPORT extern const Color PURPLE ; +CGAL_EXPORT extern const Color VIOLET ; -extern const Color ORANGE ; -extern const Color YELLOW ; +CGAL_EXPORT extern const Color ORANGE ; +CGAL_EXPORT extern const Color YELLOW ; } //namespace CGAL diff --git a/iostream/include/CGAL/IO/io.h b/iostream/include/CGAL/IO/io.h index 04095584745..bc7f8bed446 100644 --- a/iostream/include/CGAL/IO/io.h +++ b/iostream/include/CGAL/IO/io.h @@ -36,7 +36,7 @@ namespace CGAL { class IO { public: - static int mode; + CGAL_EXPORT static int mode; enum Mode {ASCII = 0, PRETTY, BINARY}; }; @@ -132,28 +132,35 @@ template Benchmark_rep bmformat( const T& t, F) { return Benchmark_rep(t); } - +CGAL_EXPORT IO::Mode get_mode(std::ios& i); +CGAL_EXPORT IO::Mode set_ascii_mode(std::ios& i); +CGAL_EXPORT IO::Mode set_binary_mode(std::ios& i); +CGAL_EXPORT IO::Mode set_pretty_mode(std::ios& i); +CGAL_EXPORT IO::Mode set_mode(std::ios& i, IO::Mode m); +CGAL_EXPORT bool is_pretty(std::ios& i); +CGAL_EXPORT bool is_ascii(std::ios& i); +CGAL_EXPORT bool is_binary(std::ios& i); @@ -271,10 +278,14 @@ std::istream &operator>>(std::istream &is, Color& col) return is; } +CGAL_EXPORT const char* mode_name( IO::Mode m ); // From polynomial.h TODO: Where to put this? +CGAL_EXPORT void swallow(std::istream &is, char d); + +CGAL_EXPORT void swallow(std::istream &is, const std::string& s ); From 4312c1cb2e990ac48a9ffa1797045aef3418b360 Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Wed, 5 Oct 2011 20:33:36 +0000 Subject: [PATCH 06/75] Add declspecs for Visual C++ so that we can build dlls --- Random_numbers/include/CGAL/Random.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Random_numbers/include/CGAL/Random.h b/Random_numbers/include/CGAL/Random.h index e9ae8aa9df5..71b731dcfa8 100644 --- a/Random_numbers/include/CGAL/Random.h +++ b/Random_numbers/include/CGAL/Random.h @@ -185,8 +185,8 @@ public: } // state - void save_state( State& state) const; - void restore_state( const State& state); + CGAL_EXPORT void save_state( State& state) const; + CGAL_EXPORT void restore_state( const State& state); // Computes a random int value smaller than 2^b. // It's supposed to be fast, useful for randomized algorithms. From b28fb2f764cd65649012444f67cb566b4cec4594 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Thu, 6 Oct 2011 09:51:48 +0000 Subject: [PATCH 07/75] Remove debugging messages --- Installation/CMakeLists.txt | 1 - Installation/src/CGAL/CMakeLists.txt | 1 - 2 files changed, 2 deletions(-) diff --git a/Installation/CMakeLists.txt b/Installation/CMakeLists.txt index 9fbc0c8323e..3538ddf4246 100644 --- a/Installation/CMakeLists.txt +++ b/Installation/CMakeLists.txt @@ -529,7 +529,6 @@ set ( CGAL_INSTALL_MAN_DIR "share/man/man1" #-------------------------------------------------------------------------------------------------- set(CGAL_LIBRARIES_DIR ${CMAKE_BINARY_DIR}/lib) -message(STATUS "CGAL_LIBRARIES_DIR=${CGAL_LIBRARIES_DIR}") set(LIBRARY_OUTPUT_PATH ${CGAL_LIBRARIES_DIR}) diff --git a/Installation/src/CGAL/CMakeLists.txt b/Installation/src/CGAL/CMakeLists.txt index a0ee1aa4623..be2211f2d7d 100644 --- a/Installation/src/CGAL/CMakeLists.txt +++ b/Installation/src/CGAL/CMakeLists.txt @@ -2,7 +2,6 @@ include_directories (${CGAL_3RD_PARTY_INCLUDE_DIRS}) add_definitions(${CGAL_3RD_PARTY_DEFINITIONS}) -message("CGAL_3RD_PARTY_LIBRARIES_DIRS=${CGAL_3RD_PARTY_LIBRARIES_DIRS}") link_directories(${CGAL_3RD_PARTY_LIBRARIES_DIRS}) build_cgal_library(CGAL CGAL "") From 4630cdca9ce7e02550da2f73777c5f53d74f443e Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Thu, 6 Oct 2011 09:53:56 +0000 Subject: [PATCH 08/75] Add export.h --- CGALimageIO/include/CGAL/ImageIO/export.h | 43 +++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100755 CGALimageIO/include/CGAL/ImageIO/export.h diff --git a/CGALimageIO/include/CGAL/ImageIO/export.h b/CGALimageIO/include/CGAL/ImageIO/export.h new file mode 100755 index 00000000000..59d5f3ad73d --- /dev/null +++ b/CGALimageIO/include/CGAL/ImageIO/export.h @@ -0,0 +1,43 @@ +// Copyright (c) 2011 GeometryFactory (France). All rights reserved. +// +// This file is part of CGAL (www.cgal.org); you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public License as +// published by the Free Software Foundation; version 2.1 of the License. +// See the file LICENSE.LGPL distributed with CGAL. +// +// Licensees holding a valid commercial license may use this file in +// accordance with the commercial license agreement provided with the software. +// +// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE +// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. +// +// $URL$ +// $Id$ +// +// +// Author(s) : Andreas Fabri + +#ifndef CGAL_IMAGEIO_EXPORT_H +#define CGAL_IMAGEIO_EXPORT_H + +#include + +#if defined(BOOST_MSVC) + +#if defined(CGAL_ImageIO_EXPORTS) // add by CMake or in cpp files of the dll +#define CGAL_IMAGEIO_EXPORT __declspec (dllexport) +#define CGAL_IMAGEIO_EXPIMP_TEMPLATE +#else +#define CGAL_IMAGEIO_EXPORT __declspec (dllimport) +#define CGAL_IMAGEIO_EXPIMP_TEMPLATE extern +#endif + +#else + +#define CGAL_IMAGEIO_EXPORT +#define CGAL_IMAGEIO_EXPIMP_TEMPLATE +#endif + +#endif // CGAL_IMAGEIO_EXPORT_H + + From d1eb195a4e8b5462e360d971dd998f10d7c78afb Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Thu, 6 Oct 2011 09:55:53 +0000 Subject: [PATCH 09/75] Add declspecs for Visual C++ so that we can build dlls --- CGALimageIO/include/CGAL/ImageIO.h | 93 +++++++++++++++--------------- 1 file changed, 47 insertions(+), 46 deletions(-) diff --git a/CGALimageIO/include/CGAL/ImageIO.h b/CGALimageIO/include/CGAL/ImageIO.h index 78e08fbca59..ef58411395c 100644 --- a/CGALimageIO/include/CGAL/ImageIO.h +++ b/CGALimageIO/include/CGAL/ImageIO.h @@ -22,6 +22,7 @@ #define IMAGEIO_H #include +#include #include @@ -354,7 +355,7 @@ _image *_createImage(int x, int y, int z, int v, @param name image file name or NULL for stdin */ -_image* _readImage(const char *name); +CGAL_IMAGEIO_EXPORT _image* _readImage(const char *name); /** Reads an image from a file and returns an image descriptor or NULL if
reading failed.
@@ -372,18 +373,18 @@ _image* _readImage(const char *name); ... ... ... , (Vt, Zl, Ym, Xn) @param name image file name or NULL */ -_image* _readNonInterlacedImage(const char *name); +CGAL_IMAGEIO_EXPORT _image* _readNonInterlacedImage(const char *name); /** Read an image from a file. The word type is supposed to be unsigned char, and the dimensions are (rx, ry, rz). */ -_image* _readImage_raw(const char *name, - const unsigned int rx, - const unsigned int ry, - const unsigned int rz, - const double vx = 1., - const double vy = 1., - const double vz = 1., - const unsigned int offset = 0); +CGAL_IMAGEIO_EXPORT _image* _readImage_raw(const char *name, + const unsigned int rx, + const unsigned int ry, + const unsigned int rz, + const double vx = 1., + const double vy = 1., + const double vz = 1., + const unsigned int offset = 0); /** Writes given image in file 'name'.
@@ -391,7 +392,7 @@ _image* _readImage_raw(const char *name, If name is NULL, image is sent to stdout. @param im image descriptor @param name file name to store image or NULL */ -int _writeImage(_image *im, const char *name); +CGAL_IMAGEIO_EXPORT int _writeImage(_image *im, const char *name); /** Read one slice of given image whose header has already been read.
File descriptor is let at the beginning of next slice and closed
@@ -399,42 +400,42 @@ int _writeImage(_image *im, const char *name); If data buffer is NULL, it is allocated for one slice only.
This funtion is dedicated to read huge inrimages. @param im image descriptor */ -void _getNextSlice(_image *im); +CGAL_IMAGEIO_EXPORT void _getNextSlice(_image *im); /** adds a format in the list of image format. Test if all mandatory fields have been filled @param format : an image format @return -1 if it failed (missing information) and 0 if it succeeded */ -int addImageFormat( PTRIMAGE_FORMAT format); +CGAL_IMAGEIO_EXPORT int addImageFormat( PTRIMAGE_FORMAT format); /** returns the first available image format */ -PTRIMAGE_FORMAT firstImageFormat(); +CGAL_IMAGEIO_EXPORT PTRIMAGE_FORMAT firstImageFormat(); /** Reads header from an image file
If file is an inrimage, only header is read. Otherwise, whole image
is read and image file descriptor is closed.
If name is NULL, header is read from STDIN @param name image file name or NULL */ -_image* _readImageHeader(const char *name); -_image *_readImageHeaderAndGetError( const char *name, int *error ); +CGAL_IMAGEIO_EXPORT _image* _readImageHeader(const char *name); +CGAL_IMAGEIO_EXPORT _image *_readImageHeaderAndGetError( const char *name, int *error ); /** Reads body from an inrmage whose header has been read by _readImageHeader @param im image to read */ -int _readImageData(_image *im); +CGAL_IMAGEIO_EXPORT int _readImageData(_image *im); /** Reads body from a vectorial inrimage whose header has been read by _readImageHeader. The image is uninterlaced (see _readNonInterlacedImage for details). @param im image descriptor*/ -int _readNonInterlacedImageData(_image *im); +CGAL_IMAGEIO_EXPORT int _readNonInterlacedImageData(_image *im); /** Reads body from a non-interlaced vectorial inrimage whose header has been read by _readImageHeader. The image buffer is interlaced. @param im image descriptor */ -int _readNonInterlacedFileData(_image *im); +CGAL_IMAGEIO_EXPORT int _readNonInterlacedFileData(_image *im); @@ -444,37 +445,37 @@ int _readNonInterlacedFileData(_image *im); or a standard file otherwise. @param im initialized image descriptor @param name image file name */ -void _openWriteImage(_image* im, const char *name) ; +CGAL_IMAGEIO_EXPORT void _openWriteImage(_image* im, const char *name) ; /** open an image file from stdin (if name == NULL), from a pipe (piped with gzip if image was compressed) or from a standard file @param im initialized image descriptor @param name image file name */ -void _openReadImage(_image *im, const char *name); +CGAL_IMAGEIO_EXPORT void _openReadImage(_image *im, const char *name); /** close an image file descriptor that was opened using _openImage @param im opened image descriptor */ -void _closeImage(_image *im); + /** return the bounding box of the image @param im opened image descriptor */ -void _get_image_bounding_box(_image* im, - double* x_min, double* y_min, double* z_min, - double* x_max, double* y_max, double* z_max); +CGAL_IMAGEIO_EXPORT void _get_image_bounding_box(_image* im, + double* x_min, double* y_min, double* z_min, + double* x_max, double* y_max, double* z_max); /** returns the endianness of the hardware architecture */ -ENDIANNESS _getEndianness(); +CGAL_IMAGEIO_EXPORT ENDIANNESS _getEndianness(); /** initializes the list of supported image formats */ -void initSupportedFileFormat(); +CGAL_IMAGEIO_EXPORT void initSupportedFileFormat(); /** prints supported image formats */ -void printSupportedFileFormat(); +CGAL_IMAGEIO_EXPORT void printSupportedFileFormat(); /** free the list of supported image formats */ -void removeSupportedFileFormat(); +CGAL_IMAGEIO_EXPORT void removeSupportedFileFormat(); /** return image type in given file @param fileName image file name */ -PTRIMAGE_FORMAT imageType(const char *fileName); +CGAL_IMAGEIO_EXPORT PTRIMAGE_FORMAT imageType(const char *fileName); extern "C" { /** function prototype to allocate memory */ @@ -487,54 +488,54 @@ typedef void (*DEALLOCATION_FUNCTION)(void *); /** set allocation and deallocation routines @param alloc new allocation routine @param del new deallocation routine */ -void setImageIOAllocationRoutines(ALLOCATION_FUNCTION alloc, - DEALLOCATION_FUNCTION del); +CGAL_IMAGEIO_EXPORT void setImageIOAllocationRoutines(ALLOCATION_FUNCTION alloc, + DEALLOCATION_FUNCTION del); /** call allocation routine */ -void *ImageIO_alloc(size_t); +CGAL_IMAGEIO_EXPORT void *ImageIO_alloc(size_t); /** call deallocation routine */ -void ImageIO_free(void *); +CGAL_IMAGEIO_EXPORT void ImageIO_free(void *); /** replaces fwrite function @param im image to write @param buf data buffer to write @param len buffer length */ -size_t ImageIO_write(const _image *im, const void *buf, size_t len); +CGAL_IMAGEIO_EXPORT size_t ImageIO_write(const _image *im, const void *buf, size_t len); /** replaces fread function @param im image to read @param buf data buffer to read @param len buffer length */ -size_t ImageIO_read(const _image *im, void *buf, size_t len); +CGAL_IMAGEIO_EXPORT size_t ImageIO_read(const _image *im, void *buf, size_t len); /** replaces fgets function */ -char *ImageIO_gets( const _image *im, char *str, int size ); +CGAL_IMAGEIO_EXPORT char *ImageIO_gets( const _image *im, char *str, int size ); /** replaces fseek function */ -int ImageIO_seek( const _image *im, long offset, int whence ); +CGAL_IMAGEIO_EXPORT int ImageIO_seek( const _image *im, long offset, int whence ); /** replaces ferror function */ -int ImageIO_error( const _image *im ); +CGAL_IMAGEIO_EXPORT int ImageIO_error( const _image *im ); /** replaces fclose function */ -int ImageIO_close( _image *im ); +CGAL_IMAGEIO_EXPORT int ImageIO_close( _image *im ); /** trilinear interpolation in an _image. The returned type is float (cast are made if the image word type is different). */ -float triLinInterp(const _image* image, float posx, float posy, float posz, - const float value_outside = 0.); +CGAL_IMAGEIO_EXPORT float triLinInterp(const _image* image, float posx, float posy, float posz, + const float value_outside = 0.); /** Alias for triLinInterp */ -inline float trilinear_interpolation(const _image* image, - float posx, float posy, float posz) +CGAL_IMAGEIO_EXPORT inline float trilinear_interpolation(const _image* image, + float posx, float posy, float posz) { return triLinInterp(image, posx, posy, posz); } @@ -693,12 +694,12 @@ static_evaluate(const _image* image, break; \ } -float evaluate(const _image* image,const unsigned int i,const unsigned int j,const unsigned int k); +CGAL_IMAGEIO_EXPORT float evaluate(const _image* image,const unsigned int i,const unsigned int j,const unsigned int k); /** convert the data of the image to float */ -void convertImageTypeToFloat(_image* image); +CGAL_IMAGEIO_EXPORT void convertImageTypeToFloat(_image* image); #endif // end IMAGEIO_H From 1960fb828ca4588b5a2339031ae8dc1fdaa9f8b5 Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Thu, 6 Oct 2011 09:58:26 +0000 Subject: [PATCH 10/75] Add NYU copyright header --- Core/include/CGAL/CORE/export.h | 39 +++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/Core/include/CGAL/CORE/export.h b/Core/include/CGAL/CORE/export.h index 373a2147460..d4910851e41 100755 --- a/Core/include/CGAL/CORE/export.h +++ b/Core/include/CGAL/CORE/export.h @@ -1,3 +1,42 @@ +/**************************************************************************** + * Core Library Version 1.7, August 2004 + * Copyright (c) 1995-2004 Exact Computation Project + * All rights reserved. + * + * This file is part of CORE (http://cs.nyu.edu/exact/core/); you may + * redistribute it under the terms of the Q Public License version 1.0. + * See the file LICENSE.QPL distributed with CORE. + * + * Licensees holding a valid commercial license may use this file in + * accordance with the commercial license agreement provided with the + * software. + * + * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE + * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. + * + * + * File: Expr.h + * Synopsis: a class of Expression in Level 3 + * + * Written by + * Koji Ouchi + * Chee Yap + * Igor Pechtchanski + * Vijay Karamcheti + * Chen Li + * Zilin Du + * Sylvain Pion + * Vikram Sharma + * + * WWW URL: http://cs.nyu.edu/exact/ + * Email: exact@cs.nyu.edu + * + * $URL$ + * $Id$ + ***************************************************************************/ + +// Author(s) : Andreas Fabri + #ifndef CGAL_CORE_EXPORT_H #define CGAL_CORE_EXPORT_H From 8c9865daef2dbee7a1399679fcc8c12cf53c6489 Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Thu, 6 Oct 2011 09:59:07 +0000 Subject: [PATCH 11/75] Add GF copyright header --- Installation/include/CGAL/auto_link/ImageIO.h | 6 ++++++ Installation/include/CGAL/export.h | 19 +++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/Installation/include/CGAL/auto_link/ImageIO.h b/Installation/include/CGAL/auto_link/ImageIO.h index ddc6e1482e0..5676dd0b2d1 100644 --- a/Installation/include/CGAL/auto_link/ImageIO.h +++ b/Installation/include/CGAL/auto_link/ImageIO.h @@ -21,10 +21,16 @@ #define CGAL_AUTO_LINK_IMAGEIO_H #ifndef CGAL_NO_AUTOLINK_IMAGEIO +#if ( ! defined( CGAL_EXPORTS ) ) && (! defined ( CGAL_ImageIO_EXPORTS ) ) + +// If CGAL_EXPORTS is defined it means that we are building the CGAL +// library as a DLL. The CGAL.dll does not really depend on CGAL_ImageIO, +// whatever the header inclusion graph says. #define CGAL_LIB_NAME CGAL_ImageIO #include +#endif // CGAL_EXPORTS #endif // CGAL_NO_AUTOLINK_IMAGEIO #endif // CGAL_AUTO_LINK_IMAGEIO_H diff --git a/Installation/include/CGAL/export.h b/Installation/include/CGAL/export.h index 741bc68dfb1..46561d9bc0f 100755 --- a/Installation/include/CGAL/export.h +++ b/Installation/include/CGAL/export.h @@ -1,3 +1,22 @@ +// Copyright (c) 2011 GeometryFactory (France). All rights reserved. +// +// This file is part of CGAL (www.cgal.org); you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public License as +// published by the Free Software Foundation; version 2.1 of the License. +// See the file LICENSE.LGPL distributed with CGAL. +// +// Licensees holding a valid commercial license may use this file in +// accordance with the commercial license agreement provided with the software. +// +// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE +// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. +// +// $URL$ +// $Id$ +// +// +// Author(s) : Andreas Fabri + #ifndef CGAL_EXPORT_H #define CGAL_EXPORT_H From 18f16c77ba496c731460ac8f9be8eb8e547d8455 Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Thu, 6 Oct 2011 12:20:14 +0000 Subject: [PATCH 12/75] Add declspecs for Visual C++ so that we can build dlls --- GraphicsView/include/CGAL/Qt/DemosMainWindow.h | 2 +- GraphicsView/include/CGAL/Qt/GraphicsViewNavigation.h | 3 ++- GraphicsView/include/CGAL/Qt/GraphicsViewPolylineInput.h | 3 ++- GraphicsView/include/CGAL/Qt/debug.h | 7 ++++--- GraphicsView/include/CGAL/Qt/utility.h | 5 +++-- GraphicsView/include/CGAL/auto_link/Qt4.h | 6 ++++++ 6 files changed, 18 insertions(+), 8 deletions(-) diff --git a/GraphicsView/include/CGAL/Qt/DemosMainWindow.h b/GraphicsView/include/CGAL/Qt/DemosMainWindow.h index 947658a9065..9a32f9098b8 100644 --- a/GraphicsView/include/CGAL/Qt/DemosMainWindow.h +++ b/GraphicsView/include/CGAL/Qt/DemosMainWindow.h @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include // forward declaration diff --git a/GraphicsView/include/CGAL/Qt/GraphicsViewNavigation.h b/GraphicsView/include/CGAL/Qt/GraphicsViewNavigation.h index 5cf718c6c36..366f6890f02 100644 --- a/GraphicsView/include/CGAL/Qt/GraphicsViewNavigation.h +++ b/GraphicsView/include/CGAL/Qt/GraphicsViewNavigation.h @@ -22,6 +22,7 @@ #define CGAL_QT_GRAPHICS_VIEW_NAVIGATION_H #include +#include #include #include #include @@ -37,7 +38,7 @@ class QGraphicsRectItem; namespace CGAL { namespace Qt { -class GraphicsViewNavigation: public QObject { +class CGAL_QT4_EXPORT GraphicsViewNavigation: public QObject { Q_OBJECT diff --git a/GraphicsView/include/CGAL/Qt/GraphicsViewPolylineInput.h b/GraphicsView/include/CGAL/Qt/GraphicsViewPolylineInput.h index 9d763cca956..320a218eb96 100644 --- a/GraphicsView/include/CGAL/Qt/GraphicsViewPolylineInput.h +++ b/GraphicsView/include/CGAL/Qt/GraphicsViewPolylineInput.h @@ -22,6 +22,7 @@ #define CGAL_QT_GRAPHICS_VIEW_POLYLINE_INPUT_H #include +#include #include #include @@ -39,7 +40,7 @@ class QObject; namespace CGAL { namespace Qt { -class GraphicsViewPolylineInput_non_templated_base : public GraphicsViewInput +class CGAL_QT4_EXPORT GraphicsViewPolylineInput_non_templated_base : public GraphicsViewInput { public: void setNumberOfVertices(int n) diff --git a/GraphicsView/include/CGAL/Qt/debug.h b/GraphicsView/include/CGAL/Qt/debug.h index 5ab09c6e6a9..33ee464b440 100644 --- a/GraphicsView/include/CGAL/Qt/debug.h +++ b/GraphicsView/include/CGAL/Qt/debug.h @@ -22,6 +22,7 @@ #define CGAL_QT_DEBUG_H #include +#include #include namespace CGAL { @@ -34,9 +35,9 @@ namespace Qt { * CGAL::Qt:traverse_resources(":"); // view all resources * and displays the resources tree on std::cerr. */ -void traverse_resources(const QString& name, - const QString& dirname = QString(), - int indent = 0); +CGAL_QT4_EXPORT void traverse_resources(const QString& name, + const QString& dirname = QString(), + int indent = 0); } // namespace Qt } // namespace CGAL diff --git a/GraphicsView/include/CGAL/Qt/utility.h b/GraphicsView/include/CGAL/Qt/utility.h index 85ea9e68d76..245239ab565 100644 --- a/GraphicsView/include/CGAL/Qt/utility.h +++ b/GraphicsView/include/CGAL/Qt/utility.h @@ -24,6 +24,7 @@ #include #include #include +#include class QGraphicsScene; class QGraphicsView; @@ -31,8 +32,8 @@ class QGraphicsView; namespace CGAL { namespace Qt { -QRectF mapToScene(const QGraphicsView* v, const QRect rect); -QRectF viewportsBbox(const QGraphicsScene*); +CGAL_QT4_EXPORT QRectF mapToScene(const QGraphicsView* v, const QRect rect); +CGAL_QT4_EXPORT QRectF viewportsBbox(const QGraphicsScene*); } // namespace Qt } // namespace CGAL diff --git a/GraphicsView/include/CGAL/auto_link/Qt4.h b/GraphicsView/include/CGAL/auto_link/Qt4.h index d6f82690a9a..6d064053373 100644 --- a/GraphicsView/include/CGAL/auto_link/Qt4.h +++ b/GraphicsView/include/CGAL/auto_link/Qt4.h @@ -21,10 +21,16 @@ #define CGAL_AUTO_LINK_QT4_H #ifndef CGAL_NO_AUTOLINK_QT4 +#if ( ! defined( CGAL_EXPORTS ) ) && (! defined ( CGAL_Qt4_EXPORTS ) ) + +// If CGAL_EXPORTS is defined it means that we are building the CGAL +// library as a DLL. The CGAL.dll does not really depend on CGAL_Qt4, +// whatever the header inclusion graph says. #define CGAL_LIB_NAME CGAL_Qt4 #include +#endif // CGAL_EXPORTS #endif // CGAL_NO_AUTOLINK_QT4 #endif // CGAL_AUTO_LINK_QT4_H From ebc4f53646e7aa9080b89d1b35748cd948ce5d3f Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Thu, 6 Oct 2011 13:14:17 +0000 Subject: [PATCH 13/75] Add declspecs for Visual C++ so that we can build dlls --- GraphicsView/include/CGAL/Qt/export.h | 42 +++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100755 GraphicsView/include/CGAL/Qt/export.h diff --git a/GraphicsView/include/CGAL/Qt/export.h b/GraphicsView/include/CGAL/Qt/export.h new file mode 100755 index 00000000000..791108a5f71 --- /dev/null +++ b/GraphicsView/include/CGAL/Qt/export.h @@ -0,0 +1,42 @@ +// Copyright (c) 2011 GeometryFactory (France). All rights reserved. +// +// This file is part of CGAL (www.cgal.org); you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public License as +// published by the Free Software Foundation; version 2.1 of the License. +// See the file LICENSE.LGPL distributed with CGAL. +// +// Licensees holding a valid commercial license may use this file in +// accordance with the commercial license agreement provided with the software. +// +// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE +// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. +// +// $URL$ +// $Id$ +// +// +// Author(s) : Andreas Fabri +#ifndef CGAL_QT4_EXPORT_H +#define CGAL_QT4_EXPORT_H + +#include + +#if defined(BOOST_MSVC) + +#if defined(CGAL_Qt4_EXPORTS) // add by CMake or in cpp files of the dll +#define CGAL_QT4_EXPORT __declspec (dllexport) +#define CGAL_QT4_EXPIMP_TEMPLATE +#else +#define CGAL_QT4_EXPORT __declspec (dllimport) +#define CGAL_QT4_EXPIMP_TEMPLATE extern +#endif + +#else + +#define CGAL_QT4_EXPORT +#define CGAL_QT4_EXPIMP_TEMPLATE +#endif + +#endif // CGAL_QT4_EXPORT_H + + From 8056b1ed393ddcdaa472349392595c2ea1ab3b41 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Thu, 6 Oct 2011 13:15:11 +0000 Subject: [PATCH 14/75] In CMake, Windows users will have the choice to choose to use static or dynamic Boost libraries --- .../cmake/modules/CGAL_SetupBoost.cmake | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/Installation/cmake/modules/CGAL_SetupBoost.cmake b/Installation/cmake/modules/CGAL_SetupBoost.cmake index 164dca9027a..4369fcfc104 100644 --- a/Installation/cmake/modules/CGAL_SetupBoost.cmake +++ b/Installation/cmake/modules/CGAL_SetupBoost.cmake @@ -1,9 +1,18 @@ if ( NOT CGAL_Boost_Setup ) -# AF: FIX THIS -# if ( NOT BUILD_SHARED_LIBS ) - set(Boost_USE_STATIC_LIBS ON) -# endif() + if(WIN32) + option(CGAL_BOOST_USE_STATIC_LIBS "Link with static Boost libraries" OFF) + if(CGAL_BOOST_USE_STATIC_LIBS) + set(Boost_USE_STATIC_LIBS ON) + else() + set(Boost_USE_STATIC_LIBS OFF) + add_to_cached_list(CGAL_3RD_PARTY_DEFINITIONS -DBOOST_ALL_DYN_LINK) + endif() + else(WIN32) + if ( NOT BUILD_SHARED_LIBS ) + set(Boost_USE_STATIC_LIBS ON) + endif() + endif(WIN32) set(Boost_FIND_VERSION 1.33.1 ) set(Boost_FIND_VERSION_MAJOR 1 ) From 62890f10e82be59d7acd44edc27e79763b67b8d9 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Thu, 6 Oct 2011 15:59:55 +0000 Subject: [PATCH 15/75] Fix a compilation error on Linux Inside the CGAL namespace, one cannot explicitly instantiate std::allocator. --- Number_types/include/CGAL/MP_Float.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Number_types/include/CGAL/MP_Float.h b/Number_types/include/CGAL/MP_Float.h index fd7ecc7eed2..8de00ad8fdf 100644 --- a/Number_types/include/CGAL/MP_Float.h +++ b/Number_types/include/CGAL/MP_Float.h @@ -127,13 +127,18 @@ MP_Float operator*(const MP_Float &a, const MP_Float &b); CGAL_EXPORT MP_Float operator%(const MP_Float &a, const MP_Float &b); -// We have to export the instantianted vector class +} // Close the CGAL namespace for the following explicit instantiation of + // std:: template classes. + +// We have to export the instantiated vector class // as it is used in inlined functions defined in the MP_Float.h file // short == MP_Float::limb CGAL_EXPIMP_TEMPLATE template class CGAL_EXPORT std::allocator; CGAL_EXPIMP_TEMPLATE template class CGAL_EXPORT std::vector; +namespace CGAL { // Reopen the namespace CGAL + class CGAL_EXPORT MP_Float { public: From aa00f78883b9ed9bc074f922b6b64d2085b46d0a Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Thu, 6 Oct 2011 16:01:16 +0000 Subject: [PATCH 16/75] Also support the compilation of CGAL libraries as static libs, with MSVC. --- CGALimageIO/include/CGAL/ImageIO/export.h | 2 +- Core/include/CGAL/CORE/export.h | 2 +- GraphicsView/include/CGAL/Qt/export.h | 2 +- Installation/CMakeLists.txt | 1 + Installation/cmake/modules/CGAL_Common.cmake | 7 +++---- Installation/include/CGAL/export.h | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CGALimageIO/include/CGAL/ImageIO/export.h b/CGALimageIO/include/CGAL/ImageIO/export.h index 59d5f3ad73d..65f7013e940 100755 --- a/CGALimageIO/include/CGAL/ImageIO/export.h +++ b/CGALimageIO/include/CGAL/ImageIO/export.h @@ -22,7 +22,7 @@ #include -#if defined(BOOST_MSVC) +#if defined(BOOST_MSVC) && defined(CGAL_BUILD_SHARED_LIB) #if defined(CGAL_ImageIO_EXPORTS) // add by CMake or in cpp files of the dll #define CGAL_IMAGEIO_EXPORT __declspec (dllexport) diff --git a/Core/include/CGAL/CORE/export.h b/Core/include/CGAL/CORE/export.h index d4910851e41..32808f96c81 100755 --- a/Core/include/CGAL/CORE/export.h +++ b/Core/include/CGAL/CORE/export.h @@ -42,7 +42,7 @@ #include -#if defined(BOOST_MSVC) && ( ! defined(CGAL_EXPORTS) ) +#if defined(BOOST_MSVC) && ( ! defined(CGAL_EXPORTS) ) && defined(CGAL_BUILD_SHARED_LIB) #if defined(CGAL_Core_EXPORTS) // add by CMake or in cpp files of the dll #define CGAL_CORE_EXPORT __declspec (dllexport) diff --git a/GraphicsView/include/CGAL/Qt/export.h b/GraphicsView/include/CGAL/Qt/export.h index 791108a5f71..6a5a7e202c1 100755 --- a/GraphicsView/include/CGAL/Qt/export.h +++ b/GraphicsView/include/CGAL/Qt/export.h @@ -21,7 +21,7 @@ #include -#if defined(BOOST_MSVC) +#if defined(BOOST_MSVC) && defined(CGAL_BUILD_SHARED_LIB) #if defined(CGAL_Qt4_EXPORTS) // add by CMake or in cpp files of the dll #define CGAL_QT4_EXPORT __declspec (dllexport) diff --git a/Installation/CMakeLists.txt b/Installation/CMakeLists.txt index 3538ddf4246..803a31d6d6c 100644 --- a/Installation/CMakeLists.txt +++ b/Installation/CMakeLists.txt @@ -483,6 +483,7 @@ add_config_flag( CGAL_USE_LEDA ) add_config_flag( CGAL_USE_MPFI ) add_config_flag( CGAL_USE_RS ) add_config_flag( CGAL_USE_NTL ) +add_config_flag( CGAL_BUILD_SHARED_LIB ) set(CGAL_USE_CORE ${CGAL_USE_GMP}) diff --git a/Installation/cmake/modules/CGAL_Common.cmake b/Installation/cmake/modules/CGAL_Common.cmake index 534c475a2f2..e6a9672047e 100644 --- a/Installation/cmake/modules/CGAL_Common.cmake +++ b/Installation/cmake/modules/CGAL_Common.cmake @@ -29,10 +29,9 @@ if( NOT CGAL_COMMON_FILE_INCLUDED ) set( CMAKE_2_6_3_OR_ABOVE FALSE ) endif() - if ( "${BUILD_SHARED_LIBS}" STREQUAL "" ) - set(BUILD_SHARED_LIBS ON) - endif() - + option(BUILD_SHARED_LIBS "Build shared libraries" ON) + set(CGAL_BUILD_SHARED_LIB ${BUILD_SHARED_LIBS}) + if ( CGAL_BUILDING_LIBS ) if ( BUILD_SHARED_LIBS ) message( STATUS "Building shared libraries" ) diff --git a/Installation/include/CGAL/export.h b/Installation/include/CGAL/export.h index 46561d9bc0f..fb13a88f8cb 100755 --- a/Installation/include/CGAL/export.h +++ b/Installation/include/CGAL/export.h @@ -22,7 +22,7 @@ #include -#if defined(BOOST_MSVC) +#if defined(BOOST_MSVC) && defined(CGAL_BUILD_SHARED_LIB) #if defined(CGAL_EXPORTS) // add by CMake or in cpp files of the dll #define CGAL_EXPORT __declspec (dllexport) From ed773cba03751525880e56fd3fbd7a51dcd25b52 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Fri, 7 Oct 2011 13:41:58 +0000 Subject: [PATCH 17/75] On Windows, add $CGAL_DIR/lib to the PATH, if case CGAL is build as DLLs. --- Testsuite/test/run_testsuite_with_cmake | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Testsuite/test/run_testsuite_with_cmake b/Testsuite/test/run_testsuite_with_cmake index 91bdac7e57e..847769182b5 100755 --- a/Testsuite/test/run_testsuite_with_cmake +++ b/Testsuite/test/run_testsuite_with_cmake @@ -196,6 +196,12 @@ run_testsuite() echo "---------------------------------------------------------------" >> "$ERRORFILE" echo >> "$ERRORFILE" + case "`uname`" in + CYGWIN*) + PATH=`cygpath "$CGAL_DIR"`/lib:$PATH + export PATH + esac + for DIR in $TEST_DIRECTORIES ; do test_directory "$DIR" done From 2735ec15710b3e1055b7d1ef143de39c1c091608 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Fri, 7 Oct 2011 13:42:37 +0000 Subject: [PATCH 18/75] Initial attempt to allow to run the testsuite with a branch build --- Testsuite/test/run_testsuite_with_cmake | 13 ++++++++++--- Testsuite/test/testsuite_branch_build.mk | 15 +++++++++++++++ 2 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 Testsuite/test/testsuite_branch_build.mk diff --git a/Testsuite/test/run_testsuite_with_cmake b/Testsuite/test/run_testsuite_with_cmake index 847769182b5..3eaca731ff0 100755 --- a/Testsuite/test/run_testsuite_with_cmake +++ b/Testsuite/test/run_testsuite_with_cmake @@ -114,7 +114,9 @@ run_local_cgal_test() fi } -#test_directory +#test_directory +# test_directory() may call itself once: the second parameter avoids that +# it calls itself infinitely. test_directory() { cd "$CURRENTDIR" @@ -174,8 +176,13 @@ test_directory() echo "ERROR: the script cgal_test_with_cmake failed to generate output" >> "$ERRORFILE" fi else - echo " Could not execute the script cgal_test_with_cmake in directory $1" - echo "ERROR: could not execute the script $1/cgal_test_with_cmake" >> $ERRORFILE + if [ -z "$2" ]; then + create_cgal_test + test_directory "$1" "second_time" + else + echo " Could not execute the script cgal_test_with_cmake in directory $1" + echo "ERROR: could not execute the script $1/cgal_test_with_cmake" >> $ERRORFILE + fi fi echo >> "$ERRORFILE" echo >> "$ERROR_OUTPUT" diff --git a/Testsuite/test/testsuite_branch_build.mk b/Testsuite/test/testsuite_branch_build.mk new file mode 100644 index 00000000000..df517e7e8ab --- /dev/null +++ b/Testsuite/test/testsuite_branch_build.mk @@ -0,0 +1,15 @@ +# A GNU makefile which calls run_testsuite_with_cmake over all directories. + +dirs:=$(wildcard ../../*/test/*/) +targets:=$(addsuffix pink_elephant,$(dirs)) +cleans:=$(addsuffix green_elephant,$(dirs)) + +all: ${targets} + +clean: ${cleans} + +%/pink_elephant: + @+./run_testsuite_with_cmake $* + +%/green_elephant: + @cd $* && $(MAKE) clean From 3d3662850eb04a59fc6321c2219cecae7be603ea Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Fri, 7 Oct 2011 14:26:14 +0000 Subject: [PATCH 19/75] must be included *after* because CGAL_BUILD_SHARED_LIB is defined in the later. --- Installation/include/CGAL/config.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Installation/include/CGAL/config.h b/Installation/include/CGAL/config.h index 2144bcb0ff2..cf0de8abac4 100644 --- a/Installation/include/CGAL/config.h +++ b/Installation/include/CGAL/config.h @@ -39,14 +39,14 @@ #include -#include - //----------------------------------------------------------------------// // platform specific workaround flags (CGAL_CFG_...) //----------------------------------------------------------------------// #include +#include + //----------------------------------------------------------------------// // Enable C++0x features with GCC -std=c++0x (even when not specified at build time) //----------------------------------------------------------------------// From 2ba22242abc9e15c35f81f28344b144b37699eef Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Sun, 9 Oct 2011 20:01:42 +0000 Subject: [PATCH 20/75] include CGAL/config.h so that we can test for CGAL_BUILD_SHARTED_LIB --- Core/include/CGAL/CORE/export.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/include/CGAL/CORE/export.h b/Core/include/CGAL/CORE/export.h index 32808f96c81..ea7e00dccaa 100755 --- a/Core/include/CGAL/CORE/export.h +++ b/Core/include/CGAL/CORE/export.h @@ -40,7 +40,7 @@ #ifndef CGAL_CORE_EXPORT_H #define CGAL_CORE_EXPORT_H -#include +#include #if defined(BOOST_MSVC) && ( ! defined(CGAL_EXPORTS) ) && defined(CGAL_BUILD_SHARED_LIB) From 8722a499cd386e44a304408aa988eab9e5329551 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Mon, 10 Oct 2011 11:38:43 +0000 Subject: [PATCH 21/75] Update LICENSE.LGPL to LGPLv3 --- Installation/LICENSE.LGPL | 619 +++++++++----------------------------- 1 file changed, 140 insertions(+), 479 deletions(-) diff --git a/Installation/LICENSE.LGPL b/Installation/LICENSE.LGPL index ae23fcfda2d..65c5ca88a67 100644 --- a/Installation/LICENSE.LGPL +++ b/Installation/LICENSE.LGPL @@ -1,504 +1,165 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Copyright (C) 2007 Free Software Foundation, Inc. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - Preamble + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. + 0. Additional Definitions. - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. + 1. Exception to Section 3 of the GNU GPL. - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. + 2. Conveying Modified Versions. - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + 3. Object Code Incorporating Material from Library Header Files. - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) + b) Accompany the object code with a copy of the GNU GPL and this license + document. - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. + 4. Combined Works. - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - , 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! - - From b4bf4af75db4cbddf68f1863043d41c9aeea5fdc Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Mon, 10 Oct 2011 11:49:39 +0000 Subject: [PATCH 22/75] One must include to use the macro CGAL_BUILD_SHARED_LIB --- GraphicsView/include/CGAL/Qt/export.h | 1 + 1 file changed, 1 insertion(+) diff --git a/GraphicsView/include/CGAL/Qt/export.h b/GraphicsView/include/CGAL/Qt/export.h index 6a5a7e202c1..c69f2404216 100755 --- a/GraphicsView/include/CGAL/Qt/export.h +++ b/GraphicsView/include/CGAL/Qt/export.h @@ -20,6 +20,7 @@ #define CGAL_QT4_EXPORT_H #include +#include #if defined(BOOST_MSVC) && defined(CGAL_BUILD_SHARED_LIB) From 91a5327fa8b65ab311b5dbad47f203106d23a4e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Mon, 10 Oct 2011 13:48:25 +0000 Subject: [PATCH 23/75] change LGPLv2 -> LGPLv3 --- .../include/CGAL/Algebraic_extension_traits.h | 4 ++-- .../include/CGAL/Algebraic_structure_traits.h | 4 ++-- .../include/CGAL/Chinese_remainder_traits.h | 4 ++-- .../include/CGAL/Coercion_traits.h | 4 ++-- .../include/CGAL/Fraction_traits.h | 4 ++-- .../include/CGAL/Needs_parens_as_product.h | 4 ++-- .../include/CGAL/Rational_traits.h | 4 ++-- .../include/CGAL/Real_embeddable_traits.h | 4 ++-- .../include/CGAL/Scalar_factor_traits.h | 4 ++-- .../include/CGAL/Test/_test_algebraic_structure.h | 4 ++-- .../include/CGAL/Test/_test_coercion_traits.h | 4 ++-- .../include/CGAL/Test/_test_fraction_traits.h | 4 ++-- .../include/CGAL/Test/_test_rational_traits.h | 4 ++-- .../include/CGAL/Test/_test_real_embeddable.h | 4 ++-- .../include/CGAL/extended_euclidean_algorithm.h | 4 ++-- Algebraic_foundations/include/CGAL/ipower.h | 4 ++-- Algebraic_foundations/include/CGAL/number_utils.h | 4 ++-- .../include/CGAL/number_utils_classes.h | 4 ++-- .../extended_euclidean_algorithm.cpp | 4 ++-- .../test/Algebraic_foundations/ipower.cpp | 4 ++-- .../Algebraic_kernel_d/Algebraic_curve_kernel_2.h | 4 ++-- .../CGAL/Algebraic_kernel_d/Algebraic_real_d_1.h | 4 ++-- .../Algebraic_real_quadratic_refinement_rep_bfi.h | 4 ++-- .../CGAL/Algebraic_kernel_d/Algebraic_real_rep.h | 4 ++-- .../Algebraic_kernel_d/Algebraic_real_rep_bfi.h | 4 ++-- .../Bitstream_coefficient_kernel.h | 4 ++-- .../Bitstream_coefficient_kernel_at_alpha.h | 4 ++-- .../CGAL/Algebraic_kernel_d/Bitstream_descartes.h | 4 ++-- .../Bitstream_descartes_E08_tree.h | 4 ++-- .../Bitstream_descartes_rndl_tree.h | 4 ++-- .../Bitstream_descartes_rndl_tree_traits.h | 4 ++-- .../CGAL/Algebraic_kernel_d/Curve_analysis_2.h | 4 ++-- .../Algebraic_kernel_d/Curve_pair_analysis_2.h | 4 ++-- .../include/CGAL/Algebraic_kernel_d/Descartes.h | 4 ++-- .../CGAL/Algebraic_kernel_d/Event_line_builder.h | 4 ++-- .../include/CGAL/Algebraic_kernel_d/Float_traits.h | 4 ++-- .../CGAL/Algebraic_kernel_d/Interval_evaluate_1.h | 4 ++-- .../CGAL/Algebraic_kernel_d/Interval_evaluate_2.h | 4 ++-- .../CGAL/Algebraic_kernel_d/LRU_hashed_map.h | 4 ++-- .../Algebraic_kernel_d/Real_embeddable_extension.h | 4 ++-- .../include/CGAL/Algebraic_kernel_d/Real_roots.h | 4 ++-- .../CGAL/Algebraic_kernel_d/Shear_controller.h | 4 ++-- .../CGAL/Algebraic_kernel_d/Shear_transformation.h | 4 ++-- .../CGAL/Algebraic_kernel_d/Status_line_CA_1.h | 4 ++-- .../CGAL/Algebraic_kernel_d/Status_line_CPA_1.h | 4 ++-- .../CGAL/Algebraic_kernel_d/Xy_coordinate_2.h | 4 ++-- .../algebraic_curve_kernel_2_tools.h | 4 ++-- .../CGAL/Algebraic_kernel_d/bound_between_1.h | 4 ++-- .../CGAL/Algebraic_kernel_d/construct_binary.h | 4 ++-- .../include/CGAL/Algebraic_kernel_d/enums.h | 4 ++-- .../include/CGAL/Algebraic_kernel_d/exceptions.h | 4 ++-- .../include/CGAL/Algebraic_kernel_d/flags.h | 4 ++-- .../include/CGAL/Algebraic_kernel_d/macros.h | 4 ++-- .../CGAL/Algebraic_kernel_d/refine_zero_against.h | 4 ++-- .../include/CGAL/Algebraic_kernel_d/shear.h | 4 ++-- .../univariate_polynomial_utils.h | 4 ++-- .../include/CGAL/Algebraic_kernel_d_1.h | 4 ++-- .../include/CGAL/Algebraic_kernel_d_2.h | 4 ++-- .../include/CGAL/Algebraic_kernel_rs_gmpq_d_1.h | 4 ++-- .../include/CGAL/Algebraic_kernel_rs_gmpz_d_1.h | 4 ++-- .../include/CGAL/RS/Algebraic_kernel_rs_1.h | 4 ++-- Algebraic_kernel_d/include/CGAL/RS/algebraic_1.h | 4 ++-- .../include/CGAL/RS/algebraic_1_comparisons.h | 4 ++-- .../include/CGAL/RS/algebraic_1_constructors.h | 4 ++-- .../include/CGAL/RS/algebraic_1_member.h | 4 ++-- .../include/CGAL/RS/algebraic_1_operators.h | 4 ++-- .../include/CGAL/RS/algebraic_1_other.h | 4 ++-- .../include/CGAL/RS/algebraic_1_real_embeddable.h | 4 ++-- Algebraic_kernel_d/include/CGAL/RS/basic.h | 4 ++-- Algebraic_kernel_d/include/CGAL/RS/compare_1.h | 4 ++-- Algebraic_kernel_d/include/CGAL/RS/crt.h | 4 ++-- Algebraic_kernel_d/include/CGAL/RS/dyadic.h | 4 ++-- Algebraic_kernel_d/include/CGAL/RS/functors_1.h | 4 ++-- Algebraic_kernel_d/include/CGAL/RS/inverse.h | 4 ++-- Algebraic_kernel_d/include/CGAL/RS/isolator_1.h | 4 ++-- Algebraic_kernel_d/include/CGAL/RS/isole_1.h | 4 ++-- Algebraic_kernel_d/include/CGAL/RS/memory.h | 4 ++-- Algebraic_kernel_d/include/CGAL/RS/p.h | 4 ++-- Algebraic_kernel_d/include/CGAL/RS/pagealloc.h | 4 ++-- Algebraic_kernel_d/include/CGAL/RS/polynomial_1.h | 4 ++-- .../include/CGAL/RS/polynomial_1_constructors.h | 4 ++-- .../include/CGAL/RS/polynomial_1_eval.h | 4 ++-- .../include/CGAL/RS/polynomial_1_functors.h | 4 ++-- .../include/CGAL/RS/polynomial_1_impl.h | 4 ++-- .../include/CGAL/RS/polynomial_1_io.h | 4 ++-- .../include/CGAL/RS/polynomial_1_member.h | 4 ++-- .../include/CGAL/RS/polynomial_1_operators.h | 4 ++-- .../include/CGAL/RS/polynomial_1_parser.h | 4 ++-- .../include/CGAL/RS/polynomial_1_utils.h | 4 ++-- .../include/CGAL/RS/polynomial_converter.h | 4 ++-- Algebraic_kernel_d/include/CGAL/RS/pp.h | 4 ++-- Algebraic_kernel_d/include/CGAL/RS/primes.h | 4 ++-- Algebraic_kernel_d/include/CGAL/RS/refine_1.h | 4 ++-- Algebraic_kernel_d/include/CGAL/RS/refine_1_rs.h | 4 ++-- Algebraic_kernel_d/include/CGAL/RS/rs_calls_1.h | 4 ++-- Algebraic_kernel_d/include/CGAL/RS/sign_1.h | 4 ++-- Algebraic_kernel_d/include/CGAL/RS/sign_1_no_rs.h | 4 ++-- Algebraic_kernel_d/include/CGAL/RS/sign_1_rs.h | 4 ++-- Algebraic_kernel_d/include/CGAL/RS/solve_1.h | 4 ++-- Algebraic_kernel_d/include/CGAL/RS/ugcd.h | 4 ++-- .../Algebraic_kernel_rs_gmpq_d_1.cpp | 4 ++-- .../Algebraic_kernel_rs_gmpz_d_1.cpp | 4 ++-- .../Real_embeddable_traits_extension.cpp | 4 ++-- .../include/CGAL/_test_algebraic_curve_kernel_2.h | 4 ++-- .../include/CGAL/_test_algebraic_kernel_1.h | 4 ++-- .../include/CGAL/_test_algebraic_kernel_2.h | 4 ++-- .../include/CGAL/_test_bitstream_descartes.h | 4 ++-- .../include/CGAL/_test_real_comparable.h | 4 ++-- .../include/CGAL/_test_real_root_isolator.h | 4 ++-- .../test/Algebraic_kernel_d/rs_isolator.cpp | 4 ++-- Arithmetic_kernel/include/CGAL/Arithmetic_kernel.h | 4 ++-- .../Arithmetic_kernel/Arithmetic_kernel_base.h | 4 ++-- .../include/CGAL/CORE_arithmetic_kernel.h | 4 ++-- .../include/CGAL/GMP_arithmetic_kernel.h | 4 ++-- .../include/CGAL/Get_arithmetic_kernel.h | 4 ++-- .../include/CGAL/LEDA_arithmetic_kernel.h | 4 ++-- .../include/CGAL/MP_Float_arithmetic_kernel.h | 4 ++-- .../include/CGAL/Test/_test_arithmetic_kernel.h | 4 ++-- .../include/CGAL/Arr_algebraic_segment_traits_2.h | 4 ++-- .../CGAL/Curved_kernel_via_analysis_2/Arc_2.h | 4 ++-- .../Curve_interval_arcno_cache.h | 4 ++-- .../Curve_renderer_facade.h | 4 ++-- .../Curved_kernel_via_analysis_2_functors.h | 4 ++-- .../Curved_kernel_via_analysis_2_impl.h | 4 ++-- .../Filtered_curved_kernel_via_analysis_2_impl.h | 4 ++-- .../Curved_kernel_via_analysis_2/Generic_arc_2.h | 4 ++-- .../Curved_kernel_via_analysis_2/Generic_point_2.h | 4 ++-- .../Make_x_monotone_2.h | 4 ++-- .../Non_x_monotone_arc_2.h | 4 ++-- .../CGAL/Curved_kernel_via_analysis_2/Point_2.h | 4 ++-- .../Qt_widget_Curve_renderer_2.h | 4 ++-- .../Sweep_curves_adapter_2.h | 4 ++-- .../gfx/Curve_renderer_2.h | 4 ++-- .../gfx/Curve_renderer_internals.h | 4 ++-- .../gfx/Curve_renderer_traits.h | 4 ++-- .../gfx/Subdivision_1.h | 4 ++-- .../gfx/Subdivision_2.h | 4 ++-- .../test/simple_models.h | 4 ++-- .../CGAL/HalfedgeDS_face_max_base_with_id.h | 4 ++-- .../CGAL/HalfedgeDS_halfedge_max_base_with_id.h | 4 ++-- .../CGAL/HalfedgeDS_vertex_max_base_with_id.h | 4 ++-- BGL/include/CGAL/Polyhedron_items_with_id_3.h | 4 ++-- .../CGAL/Triangulation_vertex_base_with_id_2.h | 4 ++-- .../graph/graph_traits_Delaunay_triangulation_2.h | 4 ++-- .../CGAL/boost/graph/graph_traits_HalfedgeDS.h | 4 ++-- .../CGAL/boost/graph/graph_traits_Polyhedron_3.h | 4 ++-- .../boost/graph/graph_traits_Triangulation_2.h | 4 ++-- .../CGAL/boost/graph/halfedge_graph_traits.h | 4 ++-- .../boost/graph/halfedge_graph_traits_HalfedgeDS.h | 4 ++-- .../graph/halfedge_graph_traits_Polyhedron_3.h | 4 ++-- .../CGAL/boost/graph/named_function_params.h | 4 ++-- BGL/include/CGAL/boost/graph/properties.h | 4 ++-- .../CGAL/boost/graph/properties_Polyhedron_3.h | 4 ++-- CGAL_ipelets/demo/CGAL_ipelets/alpha_shapes.cpp | 4 ++-- CGAL_ipelets/demo/CGAL_ipelets/arrangement.cpp | 4 ++-- .../demo/CGAL_ipelets/bbox_restriction.cpp | 4 ++-- CGAL_ipelets/demo/CGAL_ipelets/diagrams.cpp | 4 ++-- CGAL_ipelets/demo/CGAL_ipelets/generator.cpp | 4 ++-- CGAL_ipelets/demo/CGAL_ipelets/hilbert_sort.cpp | 4 ++-- CGAL_ipelets/demo/CGAL_ipelets/hull.cpp | 4 ++-- .../CGAL_ipelets/include/CGAL_ipelets/k_delaunay.h | 4 ++-- CGAL_ipelets/demo/CGAL_ipelets/mesh_2.cpp | 4 ++-- CGAL_ipelets/demo/CGAL_ipelets/minkowski.cpp | 4 ++-- CGAL_ipelets/demo/CGAL_ipelets/multi_delaunay.cpp | 4 ++-- CGAL_ipelets/demo/CGAL_ipelets/multi_regular.cpp | 4 ++-- CGAL_ipelets/demo/CGAL_ipelets/partition.cpp | 4 ++-- CGAL_ipelets/demo/CGAL_ipelets/pca.cpp | 4 ++-- CGAL_ipelets/demo/CGAL_ipelets/skeleton.cpp | 4 ++-- CGAL_ipelets/demo/CGAL_ipelets/triangulation.cpp | 4 ++-- CGAL_ipelets/include/CGAL/CGAL_Ipelet_base.h | 4 ++-- CGAL_ipelets/include/CGAL/CGAL_Ipelet_base_v6.h | 4 ++-- CGAL_ipelets/include/CGAL/CGAL_Ipelet_base_v7.h | 4 ++-- CGAL_ipelets/include/CGAL/grabbers.h | 4 ++-- Cartesian_kernel/include/CGAL/Cartesian.h | 4 ++-- .../include/CGAL/Cartesian/Aff_transformation_2.h | 4 ++-- .../include/CGAL/Cartesian/Aff_transformation_3.h | 4 ++-- .../CGAL/Cartesian/Aff_transformation_rep_2.h | 4 ++-- .../CGAL/Cartesian/Aff_transformation_rep_3.h | 4 ++-- .../include/CGAL/Cartesian/Cartesian_base.h | 4 ++-- Cartesian_kernel/include/CGAL/Cartesian/Circle_2.h | 4 ++-- Cartesian_kernel/include/CGAL/Cartesian/Circle_3.h | 4 ++-- .../include/CGAL/Cartesian/Data_accessor_2.h | 4 ++-- .../include/CGAL/Cartesian/Direction_2.h | 4 ++-- .../include/CGAL/Cartesian/Direction_3.h | 4 ++-- .../include/CGAL/Cartesian/Iso_cuboid_3.h | 4 ++-- .../include/CGAL/Cartesian/Iso_rectangle_2.h | 4 ++-- Cartesian_kernel/include/CGAL/Cartesian/Line_2.h | 4 ++-- Cartesian_kernel/include/CGAL/Cartesian/Line_3.h | 4 ++-- Cartesian_kernel/include/CGAL/Cartesian/Plane_3.h | 4 ++-- Cartesian_kernel/include/CGAL/Cartesian/Point_2.h | 4 ++-- Cartesian_kernel/include/CGAL/Cartesian/Point_3.h | 4 ++-- Cartesian_kernel/include/CGAL/Cartesian/Ray_2.h | 4 ++-- Cartesian_kernel/include/CGAL/Cartesian/Ray_3.h | 4 ++-- .../include/CGAL/Cartesian/Rotation_rep_2.h | 4 ++-- .../include/CGAL/Cartesian/Scaling_rep_2.h | 4 ++-- .../include/CGAL/Cartesian/Scaling_rep_3.h | 4 ++-- .../include/CGAL/Cartesian/Segment_2.h | 4 ++-- .../include/CGAL/Cartesian/Segment_3.h | 4 ++-- Cartesian_kernel/include/CGAL/Cartesian/Sphere_3.h | 4 ++-- .../include/CGAL/Cartesian/Tetrahedron_3.h | 4 ++-- .../include/CGAL/Cartesian/Translation_rep_2.h | 4 ++-- .../include/CGAL/Cartesian/Translation_rep_3.h | 4 ++-- .../include/CGAL/Cartesian/Triangle_2.h | 4 ++-- .../include/CGAL/Cartesian/Triangle_3.h | 4 ++-- Cartesian_kernel/include/CGAL/Cartesian/Vector_2.h | 4 ++-- Cartesian_kernel/include/CGAL/Cartesian/Vector_3.h | 4 ++-- .../include/CGAL/Cartesian/basic_constructions_2.h | 4 ++-- .../include/CGAL/Cartesian/basic_constructions_3.h | 4 ++-- .../include/CGAL/Cartesian/ft_constructions_2.h | 4 ++-- .../include/CGAL/Cartesian/ft_constructions_3.h | 4 ++-- .../include/CGAL/Cartesian/function_objects.h | 4 ++-- .../include/CGAL/Cartesian/line_constructions_2.h | 4 ++-- .../include/CGAL/Cartesian/plane_constructions_3.h | 4 ++-- .../include/CGAL/Cartesian/point_constructions_2.h | 4 ++-- .../include/CGAL/Cartesian/point_constructions_3.h | 4 ++-- .../CGAL/Cartesian/predicates_on_directions_2.h | 4 ++-- .../CGAL/Cartesian/predicates_on_planes_3.h | 4 ++-- .../CGAL/Cartesian/predicates_on_points_2.h | 4 ++-- .../CGAL/Cartesian/predicates_on_points_3.h | 4 ++-- Cartesian_kernel/include/CGAL/Cartesian/solve_3.h | 4 ++-- .../include/CGAL/Cartesian_converter.h | 4 ++-- Cartesian_kernel/include/CGAL/Simple_cartesian.h | 4 ++-- .../include/CGAL/constructions/kernel_ftC2.h | 4 ++-- .../include/CGAL/constructions/kernel_ftC3.h | 4 ++-- .../include/CGAL/predicates/kernel_ftC2.h | 4 ++-- .../include/CGAL/predicates/kernel_ftC3.h | 4 ++-- .../benchmark/parser/benchmark_lexer.cpp | 4 ++-- .../benchmark/parser/benchmark_lexer.l | 4 ++-- .../benchmark/parser/benchmark_parser.h | 4 ++-- .../benchmark/parser/benchmark_parser.y | 4 ++-- .../benchmark/parser/benchmark_visitor.cpp | 4 ++-- .../benchmark/parser/benchmark_visitor.h | 4 ++-- .../test_Circular_kernel_basic.cpp | 4 ++-- .../test_Exact_circular_kernel_basic.cpp | 4 ++-- .../CGAL/Spherical_kernel_type_equality_wrapper.h | 4 ++-- .../test_Lazy_spherical_kernel_basics.cpp | 4 ++-- .../test_Spherical_kernel_basics.cpp | 4 ++-- .../include/CGAL/Safe_circulator_from_iterator.h | 4 ++-- Circulator/include/CGAL/circulator.h | 4 ++-- Circulator/include/CGAL/circulator_bases.h | 4 ++-- Circulator/include/CGAL/circulator_impl.h | 4 ++-- Combinatorial_map/include/CGAL/Cell_attribute.h | 4 ++-- .../include/CGAL/Cell_const_iterators.h | 4 ++-- Combinatorial_map/include/CGAL/Cell_iterators.h | 4 ++-- Combinatorial_map/include/CGAL/Combinatorial_map.h | 4 ++-- .../CGAL/Combinatorial_map_basic_operations.h | 4 ++-- .../include/CGAL/Combinatorial_map_constructors.h | 4 ++-- .../include/CGAL/Combinatorial_map_min_items.h | 4 ++-- .../include/CGAL/Combinatorial_map_operations.h | 4 ++-- Combinatorial_map/include/CGAL/Dart.h | 4 ++-- .../include/CGAL/Dart_const_iterators.h | 4 ++-- Combinatorial_map/include/CGAL/Dart_iterators.h | 4 ++-- .../CGAL/internal/Combinatorial_map_functors.h | 4 ++-- .../CGAL/internal/Combinatorial_map_utility.h | 4 ++-- .../Combinatorial_map/Combinatorial_map_2_test.h | 4 ++-- .../Combinatorial_map/Combinatorial_map_3_test.h | 4 ++-- Conic_2/include/CGAL/ConicCPA2.h | 4 ++-- Conic_2/include/CGAL/ConicHPA2.h | 4 ++-- Conic_2/include/CGAL/Conic_2.h | 4 ++-- Conic_2/include/CGAL/Conic_misc.h | 4 ++-- .../doc_tex/Developers_manual/code_format.tex | 6 +++--- Distance_2/include/CGAL/squared_distance_2.h | 4 ++-- Distance_2/include/CGAL/squared_distance_2_1.h | 4 ++-- Distance_2/include/CGAL/squared_distance_2_2.h | 4 ++-- Distance_2/include/CGAL/squared_distance_utils.h | 4 ++-- Distance_2/include/CGAL/wmult.h | 4 ++-- Distance_3/include/CGAL/squared_distance_3.h | 4 ++-- Distance_3/include/CGAL/squared_distance_3_0.h | 4 ++-- Distance_3/include/CGAL/squared_distance_3_1.h | 4 ++-- Distance_3/include/CGAL/squared_distance_3_2.h | 4 ++-- .../benchmark/Filtered_kernel/Orientation_3.h | 4 ++-- .../examples/Filtered_kernel/Cartesian_I.h | 4 ++-- Filtered_kernel/include/CGAL/Filtered_kernel.h | 4 ++-- .../Cartesian_coordinate_iterator_2.h | 4 ++-- .../Cartesian_coordinate_iterator_3.h | 4 ++-- Filtered_kernel/include/CGAL/Filtered_kernel_fwd.h | 4 ++-- Filtered_kernel/include/CGAL/Filtered_predicate.h | 4 ++-- Filtered_kernel/include/CGAL/Kernel_profiler.h | 4 ++-- Filtered_kernel/include/CGAL/Lazy.h | 4 ++-- Filtered_kernel/include/CGAL/Lazy_kernel.h | 4 ++-- Filtered_kernel/include/CGAL/Restricted_double.h | 4 ++-- Filtered_kernel/include/CGAL/Robust_construction.h | 4 ++-- .../Static_filters/Compare_squared_radius_3.h | 4 ++-- .../internal/Static_filters/Compare_y_at_x_2.h | 4 ++-- .../Static_filters/Coplanar_orientation_3.h | 4 ++-- .../Coplanar_side_of_bounded_circle_3.h | 4 ++-- .../CGAL/internal/Static_filters/Orientation_2.h | 4 ++-- .../CGAL/internal/Static_filters/Orientation_3.h | 4 ++-- .../Static_filters/Side_of_oriented_circle_2.h | 4 ++-- .../Static_filters/Side_of_oriented_sphere_3.h | 4 ++-- .../internal/Static_filters/Static_filter_error.h | 4 ++-- .../CGAL/internal/Static_filters/Static_filters.h | 4 ++-- .../include/CGAL/internal/Static_filters/tools.h | 4 ++-- Generator/demo/Generator/qt3/generator.cpp | 4 ++-- .../include/CGAL/Random_convex_set_traits_2.h | 4 ++-- Generator/include/CGAL/Random_polygon_2_sweep.h | 4 ++-- Generator/include/CGAL/Random_polygon_traits_2.h | 4 ++-- Generator/include/CGAL/generators.h | 4 ++-- Generator/include/CGAL/point_generators_2.h | 4 ++-- Generator/include/CGAL/point_generators_3.h | 4 ++-- Generator/include/CGAL/point_generators_d.h | 4 ++-- Generator/include/CGAL/random_convex_set_2.h | 4 ++-- Generator/include/CGAL/random_polygon_2.h | 4 ++-- Generator/include/CGAL/random_selection.h | 4 ++-- Geomview/demo/Geomview/gv_terrain.cpp | 4 ++-- Geomview/demo/Geomview/input.cpp | 4 ++-- Geomview/demo/Geomview/kernel.cpp | 4 ++-- Geomview/include/CGAL/IO/Geomview_stream.h | 4 ++-- Geomview/src/CGAL/Geomview_stream.cpp | 4 ++-- GraphicsView/include/CGAL/Qt/export.h | 4 ++-- GraphicsView/include/CGAL/auto_link/Qt4.h | 4 ++-- .../include/CGAL/HalfedgeDS_const_decorator.h | 4 ++-- HalfedgeDS/include/CGAL/HalfedgeDS_decorator.h | 4 ++-- HalfedgeDS/include/CGAL/HalfedgeDS_default.h | 4 ++-- HalfedgeDS/include/CGAL/HalfedgeDS_face_base.h | 4 ++-- HalfedgeDS/include/CGAL/HalfedgeDS_face_min_base.h | 4 ++-- HalfedgeDS/include/CGAL/HalfedgeDS_halfedge_base.h | 4 ++-- .../include/CGAL/HalfedgeDS_halfedge_min_base.h | 4 ++-- HalfedgeDS/include/CGAL/HalfedgeDS_items_2.h | 4 ++-- .../include/CGAL/HalfedgeDS_items_decorator.h | 4 ++-- HalfedgeDS/include/CGAL/HalfedgeDS_iterator.h | 4 ++-- .../include/CGAL/HalfedgeDS_iterator_adaptor.h | 4 ++-- HalfedgeDS/include/CGAL/HalfedgeDS_list.h | 4 ++-- HalfedgeDS/include/CGAL/HalfedgeDS_min_items.h | 4 ++-- HalfedgeDS/include/CGAL/HalfedgeDS_vector.h | 4 ++-- HalfedgeDS/include/CGAL/HalfedgeDS_vertex_base.h | 4 ++-- .../include/CGAL/HalfedgeDS_vertex_min_base.h | 4 ++-- HalfedgeDS/include/CGAL/Polyhedron_items_3.h | 4 ++-- HalfedgeDS/include/CGAL/halfedgeDS_cut_component.h | 4 ++-- .../include/CGAL/halfedgeds_connected_components.h | 4 ++-- Hash_map/include/CGAL/Handle_hash_function.h | 4 ++-- Hash_map/include/CGAL/Tools/chained_map.h | 4 ++-- Hash_map/include/CGAL/Unique_hash_map.h | 4 ++-- Homogeneous_kernel/include/CGAL/Homogeneous.h | 4 ++-- .../CGAL/Homogeneous/Aff_transformationH2.h | 4 ++-- .../CGAL/Homogeneous/Aff_transformationH3.h | 4 ++-- .../include/CGAL/Homogeneous/CircleH2.h | 4 ++-- .../include/CGAL/Homogeneous/Data_accessorH2.h | 4 ++-- .../include/CGAL/Homogeneous/DirectionH2.h | 4 ++-- .../include/CGAL/Homogeneous/DirectionH3.h | 4 ++-- .../include/CGAL/Homogeneous/Homogeneous_base.h | 4 ++-- .../include/CGAL/Homogeneous/Iso_cuboidH3.h | 4 ++-- .../include/CGAL/Homogeneous/Iso_rectangleH2.h | 4 ++-- .../include/CGAL/Homogeneous/LineH2.h | 4 ++-- .../include/CGAL/Homogeneous/PlaneH3.h | 4 ++-- .../include/CGAL/Homogeneous/PointH2.h | 4 ++-- .../include/CGAL/Homogeneous/PointH3.h | 4 ++-- .../include/CGAL/Homogeneous/RayH3.h | 4 ++-- .../include/CGAL/Homogeneous/SphereH3.h | 4 ++-- .../include/CGAL/Homogeneous/VectorH2.h | 4 ++-- .../include/CGAL/Homogeneous/VectorH3.h | 4 ++-- .../CGAL/Homogeneous/basic_constructionsH2.h | 4 ++-- .../CGAL/Homogeneous/basic_constructionsH3.h | 4 ++-- .../CGAL/Homogeneous/distance_predicatesH2.h | 4 ++-- .../CGAL/Homogeneous/distance_predicatesH3.h | 4 ++-- .../include/CGAL/Homogeneous/function_objects.h | 4 ++-- .../CGAL/Homogeneous/predicates_on_directionsH2.h | 4 ++-- .../CGAL/Homogeneous/predicates_on_pointsH2.h | 4 ++-- .../CGAL/Homogeneous/predicates_on_pointsH3.h | 4 ++-- .../include/CGAL/Homogeneous_converter.h | 4 ++-- .../include/CGAL/Simple_homogeneous.h | 4 ++-- Installation/LICENSE | 2 +- Installation/cmake/modules/test_MPFI.cpp | 4 ++-- .../config/support/print_BOOST_version.cpp | 4 ++-- Installation/config/support/print_GCC_version.cpp | 4 ++-- Installation/config/support/print_GMP_version.cpp | 4 ++-- .../config/support/print_IntelCompiler_version.cpp | 4 ++-- Installation/config/support/print_LEDA_version.cpp | 4 ++-- Installation/config/support/print_MPFI_version.cpp | 4 ++-- Installation/config/support/print_MPFR_version.cpp | 4 ++-- .../config/support/print_OPENGL_version.cpp | 4 ++-- Installation/config/support/print_QT4_version.cpp | 4 ++-- Installation/config/support/print_QT_version.cpp | 4 ++-- .../config/support/print_TAUCS_version.cpp | 4 ++-- Installation/config/support/print_ZLIB_version.cpp | 4 ++-- Installation/config/support/test_ATLAS.cpp | 4 ++-- Installation/config/support/test_BLAS.cpp | 4 ++-- Installation/config/support/test_BOOST.cpp | 4 ++-- .../config/support/test_BOOST_PROGRAM_OPTIONS.cpp | 4 ++-- Installation/config/support/test_BOOST_THREAD.cpp | 4 ++-- Installation/config/support/test_GMP.cpp | 4 ++-- Installation/config/support/test_GMPXX.cpp | 4 ++-- Installation/config/support/test_LAPACK.cpp | 4 ++-- Installation/config/support/test_LEDA.cpp | 4 ++-- Installation/config/support/test_LEDAWIN.cpp | 4 ++-- Installation/config/support/test_LIDIA.cpp | 4 ++-- Installation/config/support/test_MPFR.cpp | 4 ++-- Installation/config/support/test_OPENGL.cpp | 4 ++-- Installation/config/support/test_QT.cpp | 4 ++-- Installation/config/support/test_TAUCS.cpp | 4 ++-- Installation/config/support/test_X11.cpp | 4 ++-- Installation/config/support/test_ZLIB.cpp | 4 ++-- .../CGAL_CFG_ARRAY_MEMBER_INITIALIZATION_BUG.cpp | 4 ++-- .../testfiles/CGAL_CFG_DENORMALS_COMPILE_BUG.cpp | 4 ++-- ...CGAL_CFG_FPU_ROUNDING_MODE_UNWINDING_VC_BUG.cpp | 4 ++-- .../config/testfiles/CGAL_CFG_IEEE_754_BUG.cpp | 4 ++-- .../config/testfiles/CGAL_CFG_ISTREAM_INT_BUG.cpp | 4 ++-- .../config/testfiles/CGAL_CFG_LONGNAME_BUG.cpp | 4 ++-- .../config/testfiles/CGAL_CFG_MATCHING_BUG_5.cpp | 4 ++-- .../config/testfiles/CGAL_CFG_MATCHING_BUG_6.cpp | 4 ++-- ...GAL_CFG_NESTED_CLASS_FRIEND_DECLARATION_BUG.cpp | 4 ++-- .../config/testfiles/CGAL_CFG_NO_CPP0X_ARRAY.cpp | 4 ++-- .../config/testfiles/CGAL_CFG_NO_CPP0X_AUTO.cpp | 4 ++-- .../config/testfiles/CGAL_CFG_NO_CPP0X_COPY_N.cpp | 4 ++-- .../testfiles/CGAL_CFG_NO_CPP0X_DECLTYPE.cpp | 4 ++-- ...T_TEMPLATE_ARGUMENTS_FOR_FUNCTION_TEMPLATES.cpp | 4 ++-- .../CGAL_CFG_NO_CPP0X_DELEGATING_CONSTRUCTORS.cpp | 4 ++-- ..._CFG_NO_CPP0X_DELETED_AND_DEFAULT_FUNCTIONS.cpp | 4 ++-- .../CGAL_CFG_NO_CPP0X_INITIALIZER_LISTS.cpp | 4 ++-- .../testfiles/CGAL_CFG_NO_CPP0X_ISFINITE.cpp | 4 ++-- .../config/testfiles/CGAL_CFG_NO_CPP0X_LAMBDAS.cpp | 4 ++-- .../testfiles/CGAL_CFG_NO_CPP0X_LONG_LONG.cpp | 4 ++-- .../testfiles/CGAL_CFG_NO_CPP0X_NEXT_PREV.cpp | 4 ++-- .../CGAL_CFG_NO_CPP0X_RVALUE_REFERENCE.cpp | 4 ++-- .../testfiles/CGAL_CFG_NO_CPP0X_STATIC_ASSERT.cpp | 4 ++-- .../config/testfiles/CGAL_CFG_NO_CPP0X_TUPLE.cpp | 4 ++-- .../CGAL_CFG_NO_CPP0X_VARIADIC_TEMPLATES.cpp | 4 ++-- .../config/testfiles/CGAL_CFG_NO_LIMITS.cpp | 4 ++-- .../CGAL_CFG_NO_LOGICAL_OPERATORS_ALTERNATIVES.cpp | 4 ++-- .../testfiles/CGAL_CFG_NO_MESSAGE_PRAGMA_BUG.cpp | 4 ++-- .../config/testfiles/CGAL_CFG_NO_NEXTAFTER.cpp | 4 ++-- .../CGAL_CFG_NO_STATEMENT_EXPRESSIONS.cpp | 4 ++-- Installation/config/testfiles/CGAL_CFG_NO_STL.cpp | 4 ++-- .../testfiles/CGAL_CFG_NO_TMPL_IN_TMPL_PARAM.cpp | 4 ++-- .../config/testfiles/CGAL_CFG_NO_TR1_ARRAY.cpp | 4 ++-- .../config/testfiles/CGAL_CFG_NO_TR1_TUPLE.cpp | 4 ++-- .../CGAL_CFG_NO_WARNING_CPP_DIRECTIVE_BUG.cpp | 4 ++-- .../testfiles/CGAL_CFG_NUMERIC_LIMITS_BUG.cpp | 4 ++-- .../CGAL_CFG_OUTOFLINE_MEMBER_DEFINITION_BUG.cpp | 4 ++-- .../CGAL_CFG_TEMPLATE_IN_DEFAULT_PARAMETER_BUG.cpp | 4 ++-- ...AL_CFG_TYPENAME_BEFORE_DEFAULT_ARGUMENT_BUG.cpp | 4 ++-- .../testfiles/CGAL_CFG_USING_BASE_MEMBER_BUG_2.cpp | 4 ++-- Installation/config/version.h.in | 4 ++-- Installation/include/CGAL/auto_link/CGAL.h | 4 ++-- Installation/include/CGAL/auto_link/CGALQt3.h | 4 ++-- Installation/include/CGAL/auto_link/CORE.h | 4 ++-- Installation/include/CGAL/auto_link/GMP.h | 4 ++-- Installation/include/CGAL/auto_link/ImageIO.h | 4 ++-- Installation/include/CGAL/auto_link/LAPACK.h | 4 ++-- Installation/include/CGAL/auto_link/MPFR.h | 4 ++-- Installation/include/CGAL/auto_link/TAUCS.h | 4 ++-- Installation/include/CGAL/auto_link/auto_link.h | 4 ++-- Installation/include/CGAL/config.h | 4 ++-- Installation/include/CGAL/export.h | 4 ++-- Installation/include/CGAL/gl.h | 4 ++-- Installation/include/CGAL/glu.h | 4 ++-- .../include/CGAL/internal/deprecation_warning.h | 4 ++-- Installation/include/CGAL/internal/gcc_cpp0x.h | 4 ++-- Installation/include/CGAL/version.h | 4 ++-- .../include/CGAL/Bbox_2_Line_2_intersection.h | 4 ++-- .../include/CGAL/Bbox_2_Ray_2_intersection.h | 4 ++-- Intersections_2/include/CGAL/Bbox_2_intersection.h | 4 ++-- .../include/CGAL/Circle_2_Circle_2_intersection.h | 4 ++-- .../include/CGAL/Circle_2_Line_2_intersection.h | 4 ++-- .../Triangle_2_Triangle_2_intersection_impl.h | 4 ++-- .../Iso_rectangle_2_Iso_rectangle_2_intersection.h | 4 ++-- .../CGAL/Iso_rectangle_2_Line_2_intersection.h | 4 ++-- .../CGAL/Iso_rectangle_2_Point_2_intersection.h | 4 ++-- .../CGAL/Iso_rectangle_2_Ray_2_intersection.h | 4 ++-- .../CGAL/Iso_rectangle_2_Segment_2_intersection.h | 4 ++-- .../include/CGAL/Line_2_Bbox_2_intersection.h | 4 ++-- .../CGAL/Line_2_Iso_rectangle_2_intersection.h | 4 ++-- .../include/CGAL/Line_2_Line_2_intersection.h | 4 ++-- .../include/CGAL/Line_2_Point_2_intersection.h | 4 ++-- .../include/CGAL/Line_2_Ray_2_intersection.h | 4 ++-- .../include/CGAL/Line_2_Segment_2_intersection.h | 4 ++-- .../include/CGAL/Line_2_Triangle_2_intersection.h | 4 ++-- .../CGAL/Point_2_Iso_rectangle_2_intersection.h | 4 ++-- .../include/CGAL/Point_2_Line_2_intersection.h | 4 ++-- .../include/CGAL/Point_2_Point_2_intersection.h | 4 ++-- .../include/CGAL/Point_2_Ray_2_intersection.h | 4 ++-- .../include/CGAL/Point_2_Segment_2_intersection.h | 4 ++-- .../include/CGAL/Point_2_Triangle_2_intersection.h | 4 ++-- .../include/CGAL/Ray_2_Bbox_2_intersection.h | 4 ++-- .../CGAL/Ray_2_Iso_rectangle_2_intersection.h | 4 ++-- .../include/CGAL/Ray_2_Line_2_intersection.h | 4 ++-- .../include/CGAL/Ray_2_Point_2_intersection.h | 4 ++-- .../include/CGAL/Ray_2_Ray_2_intersection.h | 4 ++-- .../include/CGAL/Ray_2_Segment_2_intersection.h | 4 ++-- .../include/CGAL/Ray_2_Triangle_2_intersection.h | 4 ++-- .../CGAL/Segment_2_Iso_rectangle_2_intersection.h | 4 ++-- .../include/CGAL/Segment_2_Line_2_intersection.h | 4 ++-- .../include/CGAL/Segment_2_Point_2_intersection.h | 4 ++-- .../include/CGAL/Segment_2_Ray_2_intersection.h | 4 ++-- .../CGAL/Segment_2_Segment_2_intersection.h | 4 ++-- .../CGAL/Segment_2_Triangle_2_intersection.h | 4 ++-- Intersections_2/include/CGAL/Straight_2.h | 4 ++-- .../CGAL/Triangle_2_Iso_rectangle_2_intersection.h | 4 ++-- .../include/CGAL/Triangle_2_Line_2_intersection.h | 4 ++-- .../include/CGAL/Triangle_2_Point_2_intersection.h | 4 ++-- .../include/CGAL/Triangle_2_Ray_2_intersection.h | 4 ++-- .../CGAL/Triangle_2_Segment_2_intersection.h | 4 ++-- .../CGAL/Triangle_2_Triangle_2_do_intersect.h | 4 ++-- .../CGAL/Triangle_2_Triangle_2_intersection.h | 4 ++-- Intersections_2/include/CGAL/intersection_2.h | 4 ++-- Intersections_2/include/CGAL/intersection_2_1.h | 4 ++-- Intersections_2/include/CGAL/intersection_2_2.h | 4 ++-- Intersections_2/include/CGAL/intersection_2_3.h | 4 ++-- Intersections_2/src/CGAL/Bbox_2_intersections.cpp | 4 ++-- .../CGAL/Intersections_3/intersection_3_1_impl.h | 4 ++-- .../include/CGAL/Triangle_3_Line_3_do_intersect.h | 4 ++-- .../include/CGAL/Triangle_3_Plane_3_do_intersect.h | 4 ++-- .../include/CGAL/Triangle_3_Point_3_do_intersect.h | 4 ++-- .../include/CGAL/Triangle_3_Ray_3_do_intersect.h | 4 ++-- .../CGAL/Triangle_3_Segment_3_do_intersect.h | 4 ++-- .../CGAL/Triangle_3_Tetrahedron_3_do_intersect.h | 4 ++-- .../CGAL/Triangle_3_Triangle_3_do_intersect.h | 4 ++-- .../CGAL/Triangle_3_Triangle_3_intersection.h | 4 ++-- Intersections_3/include/CGAL/bbox_intersection_3.h | 4 ++-- .../Intersections_3/Bbox_3_Bbox_3_do_intersect.h | 4 ++-- .../Intersections_3/Bbox_3_Line_3_do_intersect.h | 4 ++-- .../Intersections_3/Bbox_3_Plane_3_do_intersect.h | 4 ++-- .../Intersections_3/Bbox_3_Ray_3_do_intersect.h | 4 ++-- .../Bbox_3_Segment_3_do_intersect.h | 4 ++-- .../Intersections_3/Bbox_3_Sphere_3_do_intersect.h | 4 ++-- .../Bbox_3_Triangle_3_do_intersect.h | 4 ++-- .../Triangle_3_Line_3_intersection.h | 4 ++-- .../Triangle_3_Ray_3_intersection.h | 4 ++-- .../Triangle_3_Segment_3_intersection.h | 4 ++-- Intersections_3/include/CGAL/intersection_3.h | 4 ++-- Intersections_3/include/CGAL/intersection_3_1.h | 4 ++-- Intersections_3/include/CGAL/intersections.h | 4 ++-- .../bbox_other_do_intersect_test.cpp | 4 ++-- .../triangle_other_intersection_test.cpp | 4 ++-- .../include/CGAL/Bigfloat_interval_traits.h | 4 ++-- Interval_support/include/CGAL/Interval_traits.h | 4 ++-- .../CGAL/Test/_test_bigfloat_interval_traits.h | 4 ++-- .../include/CGAL/Test/_test_convert_to_bfi.h | 4 ++-- .../include/CGAL/Test/_test_interval_traits.h | 4 ++-- Interval_support/include/CGAL/convert_to_bfi.h | 4 ++-- .../include/CGAL/IO/Alpha_shape_3_VRML_2_ostream.h | 4 ++-- Inventor/include/CGAL/IO/Inventor_ostream.h | 4 ++-- Inventor/include/CGAL/IO/VRML_1_ostream.h | 4 ++-- Inventor/include/CGAL/IO/VRML_2_ostream.h | 4 ++-- Kernel_23/include/CGAL/Aff_transformation_2.h | 4 ++-- Kernel_23/include/CGAL/Aff_transformation_3.h | 4 ++-- Kernel_23/include/CGAL/Bbox_2.h | 4 ++-- Kernel_23/include/CGAL/Bbox_3.h | 4 ++-- Kernel_23/include/CGAL/Circle_2.h | 4 ++-- Kernel_23/include/CGAL/Circle_3.h | 4 ++-- Kernel_23/include/CGAL/Dimension.h | 4 ++-- Kernel_23/include/CGAL/Direction_2.h | 4 ++-- Kernel_23/include/CGAL/Direction_3.h | 4 ++-- Kernel_23/include/CGAL/Enum_converter.h | 4 ++-- .../Exact_predicates_exact_constructions_kernel.h | 4 ++-- ...edicates_exact_constructions_kernel_with_sqrt.h | 4 ++-- ...Exact_predicates_inexact_constructions_kernel.h | 4 ++-- Kernel_23/include/CGAL/Is_a_predicate.h | 4 ++-- Kernel_23/include/CGAL/Iso_cuboid_3.h | 4 ++-- Kernel_23/include/CGAL/Iso_rectangle_2.h | 4 ++-- Kernel_23/include/CGAL/Kernel/Dimension_utils.h | 4 ++-- Kernel_23/include/CGAL/Kernel/Return_base_tag.h | 4 ++-- Kernel_23/include/CGAL/Kernel/Same_uncertainty.h | 4 ++-- .../include/CGAL/Kernel/Type_equality_wrapper.h | 4 ++-- Kernel_23/include/CGAL/Kernel/Type_mapper.h | 4 ++-- Kernel_23/include/CGAL/Kernel/Wutils.h | 4 ++-- Kernel_23/include/CGAL/Kernel/function_objects.h | 4 ++-- Kernel_23/include/CGAL/Kernel/global_functions.h | 4 ++-- Kernel_23/include/CGAL/Kernel/global_functions_2.h | 4 ++-- Kernel_23/include/CGAL/Kernel/global_functions_3.h | 4 ++-- .../CGAL/Kernel/global_functions_internal_2.h | 4 ++-- .../CGAL/Kernel/global_functions_internal_3.h | 4 ++-- Kernel_23/include/CGAL/Kernel/interface_macros.h | 4 ++-- Kernel_23/include/CGAL/Kernel/mpl.h | 4 ++-- Kernel_23/include/CGAL/Kernel/solve.h | 4 ++-- Kernel_23/include/CGAL/Kernel_checker.h | 4 ++-- Kernel_23/include/CGAL/Kernel_traits.h | 4 ++-- Kernel_23/include/CGAL/Line_2.h | 4 ++-- Kernel_23/include/CGAL/Line_3.h | 4 ++-- Kernel_23/include/CGAL/Origin.h | 4 ++-- Kernel_23/include/CGAL/Plane_3.h | 4 ++-- Kernel_23/include/CGAL/Point_2.h | 4 ++-- Kernel_23/include/CGAL/Point_3.h | 4 ++-- Kernel_23/include/CGAL/Qualified_result_of.h | 4 ++-- Kernel_23/include/CGAL/Ray_2.h | 4 ++-- Kernel_23/include/CGAL/Ray_3.h | 4 ++-- Kernel_23/include/CGAL/Segment_2.h | 4 ++-- Kernel_23/include/CGAL/Segment_3.h | 4 ++-- Kernel_23/include/CGAL/Sphere_3.h | 4 ++-- Kernel_23/include/CGAL/Tetrahedron_3.h | 4 ++-- Kernel_23/include/CGAL/Triangle_2.h | 4 ++-- Kernel_23/include/CGAL/Triangle_3.h | 4 ++-- Kernel_23/include/CGAL/Vector_2.h | 4 ++-- Kernel_23/include/CGAL/Vector_3.h | 4 ++-- Kernel_23/include/CGAL/aff_transformation_tags.h | 4 ++-- Kernel_23/include/CGAL/basic.h | 4 ++-- Kernel_23/include/CGAL/basic_classes.h | 4 ++-- Kernel_23/include/CGAL/basic_constructions_2.h | 4 ++-- Kernel_23/include/CGAL/basic_constructions_3.h | 4 ++-- .../CGAL/cartesian_homogeneous_conversion.h | 4 ++-- Kernel_23/include/CGAL/determinant.h | 4 ++-- Kernel_23/include/CGAL/distance_predicates_2.h | 4 ++-- Kernel_23/include/CGAL/distance_predicates_3.h | 4 ++-- Kernel_23/include/CGAL/enum.h | 4 ++-- Kernel_23/include/CGAL/functions_on_enums.h | 4 ++-- Kernel_23/include/CGAL/kernel_assertions.h | 4 ++-- Kernel_23/include/CGAL/kernel_basic.h | 4 ++-- Kernel_23/include/CGAL/kernel_to_kernel.h | 4 ++-- .../include/CGAL/predicates/sign_of_determinant.h | 4 ++-- Kernel_23/include/CGAL/predicates_on_lines_2.h | 4 ++-- Kernel_23/include/CGAL/predicates_on_points_2.h | 4 ++-- Kernel_23/include/CGAL/predicates_on_points_3.h | 4 ++-- Kernel_23/include/CGAL/rational_rotation.h | 4 ++-- Kernel_23/include/CGAL/representation_tags.h | 4 ++-- Kernel_23/include/CGAL/user_classes.h | 4 ++-- Kernel_23/src/CGAL/kernel.cpp | 4 ++-- Kernel_23/test/Kernel_23/Cartesian.cpp | 4 ++-- Kernel_23/test/Kernel_23/Filtered_cartesian.cpp | 4 ++-- Kernel_23/test/Kernel_23/Filtered_homogeneous.cpp | 4 ++-- Kernel_23/test/Kernel_23/Homogeneous.cpp | 4 ++-- Kernel_23/test/Kernel_23/Lazy_kernel.cpp | 4 ++-- Kernel_23/test/Kernel_23/Simple_cartesian.cpp | 4 ++-- Kernel_23/test/Kernel_23/Simple_homogeneous.cpp | 4 ++-- .../test/Kernel_23/include/CGAL/Precise_numbers.h | 4 ++-- Kernel_23/test/Kernel_23/include/CGAL/_test_2.h | 4 ++-- Kernel_23/test/Kernel_23/include/CGAL/_test_3.h | 4 ++-- .../test/Kernel_23/include/CGAL/_test_angle.h | 4 ++-- .../include/CGAL/_test_cls_aff_transformation_2.h | 4 ++-- .../include/CGAL/_test_cls_aff_transformation_3.h | 4 ++-- .../Kernel_23/include/CGAL/_test_cls_circle_2.h | 4 ++-- .../Kernel_23/include/CGAL/_test_cls_circle_3.h | 4 ++-- .../include/CGAL/_test_cls_circle_new_2.h | 4 ++-- .../Kernel_23/include/CGAL/_test_cls_direction_2.h | 4 ++-- .../Kernel_23/include/CGAL/_test_cls_direction_3.h | 4 ++-- .../include/CGAL/_test_cls_iso_cuboid_3.h | 4 ++-- .../include/CGAL/_test_cls_iso_rectangle_2.h | 4 ++-- .../include/CGAL/_test_cls_iso_rectangle_new_2.h | 4 ++-- .../test/Kernel_23/include/CGAL/_test_cls_line_2.h | 4 ++-- .../test/Kernel_23/include/CGAL/_test_cls_line_3.h | 4 ++-- .../Kernel_23/include/CGAL/_test_cls_line_new_2.h | 4 ++-- .../test/Kernel_23/include/CGAL/_test_cls_object.h | 4 ++-- .../Kernel_23/include/CGAL/_test_cls_plane_3.h | 4 ++-- .../Kernel_23/include/CGAL/_test_cls_point_2.h | 4 ++-- .../Kernel_23/include/CGAL/_test_cls_point_3.h | 4 ++-- .../Kernel_23/include/CGAL/_test_cls_quotient.h | 4 ++-- .../test/Kernel_23/include/CGAL/_test_cls_ray_2.h | 4 ++-- .../test/Kernel_23/include/CGAL/_test_cls_ray_3.h | 4 ++-- .../Kernel_23/include/CGAL/_test_cls_ray_new_2.h | 4 ++-- .../Kernel_23/include/CGAL/_test_cls_segment_2.h | 4 ++-- .../Kernel_23/include/CGAL/_test_cls_segment_3.h | 4 ++-- .../include/CGAL/_test_cls_segment_new_2.h | 4 ++-- .../Kernel_23/include/CGAL/_test_cls_sphere_3.h | 4 ++-- .../include/CGAL/_test_cls_tetrahedron_3.h | 4 ++-- .../Kernel_23/include/CGAL/_test_cls_triangle_2.h | 4 ++-- .../Kernel_23/include/CGAL/_test_cls_triangle_3.h | 4 ++-- .../include/CGAL/_test_cls_triangle_new_2.h | 4 ++-- .../Kernel_23/include/CGAL/_test_cls_vector_2.h | 4 ++-- .../Kernel_23/include/CGAL/_test_cls_vector_3.h | 4 ++-- .../include/CGAL/_test_compare_dihedral_angle_3.h | 4 ++-- .../include/CGAL/_test_fct_constructions_2.h | 4 ++-- .../include/CGAL/_test_fct_constructions_3.h | 4 ++-- .../Kernel_23/include/CGAL/_test_fct_coplanar_3.h | 4 ++-- .../Kernel_23/include/CGAL/_test_fct_determinant.h | 4 ++-- .../Kernel_23/include/CGAL/_test_fct_direction_2.h | 4 ++-- .../test/Kernel_23/include/CGAL/_test_fct_line_2.h | 4 ++-- .../Kernel_23/include/CGAL/_test_fct_plane_3.h | 4 ++-- .../Kernel_23/include/CGAL/_test_fct_point_2.h | 4 ++-- .../Kernel_23/include/CGAL/_test_fct_point_3.h | 4 ++-- .../include/CGAL/_test_fct_point_conversion.h | 4 ++-- .../include/CGAL/_test_fct_point_line_2.h | 4 ++-- .../include/CGAL/_test_fct_point_segment_2.h | 4 ++-- .../include/CGAL/_test_fct_point_vector_2.h | 4 ++-- .../include/CGAL/_test_fct_point_vector_3.h | 4 ++-- .../CGAL/_test_fct_points_implicit_sphere.h | 4 ++-- .../Kernel_23/include/CGAL/_test_fct_segment_2.h | 4 ++-- .../Kernel_23/include/CGAL/_test_fct_vector_2.h | 4 ++-- .../Kernel_23/include/CGAL/_test_fct_vector_3.h | 4 ++-- .../include/CGAL/_test_further_fct_point_2.h | 4 ++-- .../include/CGAL/_test_further_fct_point_line_2.h | 4 ++-- .../include/CGAL/_test_further_fct_point_plane_3.h | 4 ++-- Kernel_23/test/Kernel_23/include/CGAL/_test_io.h | 4 ++-- .../include/CGAL/_test_mf_plane_3_to_2d.h | 4 ++-- .../test/Kernel_23/include/CGAL/_test_new_2.h | 4 ++-- .../test/Kernel_23/include/CGAL/_test_new_3.h | 4 ++-- .../CGAL/_test_orientation_and_bounded_side.h | 4 ++-- Kernel_23/test/Kernel_23/test_kernel__.cpp | 4 ++-- Kernel_d/include/CGAL/Cartesian_d.h | 4 ++-- Kernel_d/include/CGAL/Homogeneous_d.h | 4 ++-- .../include/CGAL/Kernel_d/Aff_transformationCd.h | 4 ++-- .../include/CGAL/Kernel_d/Aff_transformationHd.h | 4 ++-- .../include/CGAL/Kernel_d/Aff_transformation_d.h | 4 ++-- .../CGAL/Kernel_d/Cartesian_const_iterator_d.h | 4 ++-- Kernel_d/include/CGAL/Kernel_d/DirectionCd.h | 4 ++-- Kernel_d/include/CGAL/Kernel_d/DirectionCd_impl.h | 4 ++-- Kernel_d/include/CGAL/Kernel_d/DirectionHd.h | 4 ++-- Kernel_d/include/CGAL/Kernel_d/DirectionHd_impl.h | 4 ++-- Kernel_d/include/CGAL/Kernel_d/Direction_d.h | 4 ++-- Kernel_d/include/CGAL/Kernel_d/HyperplaneCd.h | 4 ++-- Kernel_d/include/CGAL/Kernel_d/HyperplaneCd_impl.h | 4 ++-- Kernel_d/include/CGAL/Kernel_d/HyperplaneHd.h | 4 ++-- Kernel_d/include/CGAL/Kernel_d/HyperplaneHd_impl.h | 4 ++-- Kernel_d/include/CGAL/Kernel_d/Hyperplane_d.h | 4 ++-- Kernel_d/include/CGAL/Kernel_d/Interface_classes.h | 4 ++-- Kernel_d/include/CGAL/Kernel_d/Iso_box_d.h | 4 ++-- Kernel_d/include/CGAL/Kernel_d/Kernel_classesCd.h | 4 ++-- Kernel_d/include/CGAL/Kernel_d/Kernel_classesHd.h | 4 ++-- Kernel_d/include/CGAL/Kernel_d/Line_d.h | 4 ++-- Kernel_d/include/CGAL/Kernel_d/Line_d_impl.h | 4 ++-- .../include/CGAL/Kernel_d/Linear_algebraCd_impl.h | 4 ++-- .../include/CGAL/Kernel_d/Linear_algebraHd_impl.h | 4 ++-- Kernel_d/include/CGAL/Kernel_d/Matrix__.h | 4 ++-- Kernel_d/include/CGAL/Kernel_d/PVDHACd_impl.h | 4 ++-- Kernel_d/include/CGAL/Kernel_d/PVDHAHd_impl.h | 4 ++-- Kernel_d/include/CGAL/Kernel_d/Pair_d.h | 4 ++-- Kernel_d/include/CGAL/Kernel_d/PointCd.h | 4 ++-- Kernel_d/include/CGAL/Kernel_d/PointCd_impl.h | 4 ++-- Kernel_d/include/CGAL/Kernel_d/PointHd.h | 4 ++-- Kernel_d/include/CGAL/Kernel_d/PointHd_impl.h | 4 ++-- Kernel_d/include/CGAL/Kernel_d/Point_d.h | 4 ++-- Kernel_d/include/CGAL/Kernel_d/Ray_d.h | 4 ++-- Kernel_d/include/CGAL/Kernel_d/Segment_d.h | 4 ++-- Kernel_d/include/CGAL/Kernel_d/Sphere_d.h | 4 ++-- Kernel_d/include/CGAL/Kernel_d/Tuple_d.h | 4 ++-- Kernel_d/include/CGAL/Kernel_d/VectorCd.h | 4 ++-- Kernel_d/include/CGAL/Kernel_d/VectorCd_impl.h | 4 ++-- Kernel_d/include/CGAL/Kernel_d/VectorHd.h | 4 ++-- Kernel_d/include/CGAL/Kernel_d/VectorHd_impl.h | 4 ++-- Kernel_d/include/CGAL/Kernel_d/Vector__.h | 4 ++-- Kernel_d/include/CGAL/Kernel_d/Vector_d.h | 4 ++-- Kernel_d/include/CGAL/Kernel_d/debug.h | 4 ++-- Kernel_d/include/CGAL/Kernel_d/function_objects.h | 4 ++-- .../include/CGAL/Kernel_d/function_objectsCd.h | 4 ++-- .../include/CGAL/Kernel_d/function_objectsHd.h | 4 ++-- .../include/CGAL/Kernel_d/intersection_objectsCd.h | 4 ++-- .../include/CGAL/Kernel_d/intersection_objectsHd.h | 4 ++-- .../include/CGAL/Kernel_d/intersection_objects_d.h | 4 ++-- Kernel_d/include/CGAL/Kernel_d/simple_objects.h | 4 ++-- Kernel_d/include/CGAL/Linear_algebraCd.h | 4 ++-- Kernel_d/include/CGAL/Linear_algebraHd.h | 4 ++-- Kernel_d/include/CGAL/constructions_d.h | 4 ++-- Kernel_d/include/CGAL/intersections_d.h | 4 ++-- Kernel_d/include/CGAL/predicates_d.h | 4 ++-- Kernel_d/include/CGAL/simple_transformations_d.h | 4 ++-- .../SoQt_examiner_viewer.cpp | 4 ++-- .../include/SoQt_examiner_viewer.h | 4 ++-- .../Kinetic_data_structures/include/SoQt_handle.h | 4 ++-- .../include/SoQt_moving_points_3.h | 4 ++-- .../include/SoQt_moving_weighted_points_3.h | 4 ++-- .../include/SoQt_triangulation_3.h | 4 ++-- .../include/SoQt_widget_3.h | 4 ++-- .../include/CGAL/Kinetic/Active_objects_set.h | 4 ++-- .../CGAL/Kinetic/Exact_simulation_traits_1.h | 4 ++-- .../CGAL/Kinetic/Exact_simulation_traits_2.h | 4 ++-- .../CGAL/Kinetic/Exact_simulation_traits_3.h | 4 ++-- .../CGAL/Kinetic/Inexact_simulation_traits_1.h | 4 ++-- .../CGAL/Kinetic/Inexact_simulation_traits_2.h | 4 ++-- .../CGAL/Kinetic/Inexact_simulation_traits_3.h | 4 ++-- .../include/CGAL/Kinetic/Simulation_traits.h | 4 ++-- .../CGAL/Polynomial/Default_filtering_traits.h | 4 ++-- .../include/CGAL/Polynomial/Filtered_kernel.h | 4 ++-- .../CGAL/Polynomial/Lazy_upper_bound_root_stack.h | 4 ++-- .../CGAL/Polynomial/Upper_bound_root_stack.h | 4 ++-- .../Upper_bound_root_stack_Descartes_traits.h | 4 ++-- ...er_bound_root_stack_filtered_Descartes_traits.h | 4 ++-- .../Updatable_Delaunay_triangulation_table_2.h | 4 ++-- .../include/CGAL/Kinetic/Active_objects_vector.h | 4 ++-- .../Kinetic/CORE_Expr_exact_simulation_traits.h | 4 ++-- .../include/CGAL/Kinetic/Cartesian.h | 4 ++-- .../include/CGAL/Kinetic/Certificate_generator.h | 4 ++-- .../CGAL/Kinetic/Default_instantaneous_kernel.h | 4 ++-- .../include/CGAL/Kinetic/Default_simulator.h | 4 ++-- .../CGAL/Kinetic/Delaunay_triangulation_2.h | 4 ++-- .../CGAL/Kinetic/Delaunay_triangulation_3.h | 4 ++-- .../Kinetic/Delaunay_triangulation_cell_base_3.h | 4 ++-- .../Delaunay_triangulation_default_traits_2.h | 4 ++-- .../Delaunay_triangulation_event_log_visitor_2.h | 4 ++-- .../Delaunay_triangulation_event_log_visitor_3.h | 4 ++-- .../Kinetic/Delaunay_triangulation_face_base_2.h | 4 ++-- ...Delaunay_triangulation_recent_edges_visitor_2.h | 4 ++-- .../Kinetic/Delaunay_triangulation_vertex_base_2.h | 4 ++-- .../Delaunay_triangulation_visitor_base_2.h | 4 ++-- .../Delaunay_triangulation_visitor_base_3.h | 4 ++-- .../Kinetic/Derivitive_filter_function_kernel.h | 4 ++-- .../include/CGAL/Kinetic/Enclosing_box_2.h | 4 ++-- .../include/CGAL/Kinetic/Enclosing_box_3.h | 4 ++-- .../include/CGAL/Kinetic/Erase_event.h | 4 ++-- .../include/CGAL/Kinetic/Event_base.h | 4 ++-- .../include/CGAL/Kinetic/Exact_simulation_traits.h | 4 ++-- .../include/CGAL/Kinetic/Free_event_base.h | 4 ++-- .../Kinetic/Handle_degeneracy_function_kernel.h | 4 ++-- .../CGAL/Kinetic/Heap_pointer_event_queue.h | 4 ++-- .../include/CGAL/Kinetic/IO/Qt_moving_points_2.h | 4 ++-- .../include/CGAL/Kinetic/IO/Qt_triangulation_2.h | 4 ++-- .../include/CGAL/Kinetic/IO/Qt_widget_2.h | 4 ++-- .../include/CGAL/Kinetic/IO/internal/GUI_base.h | 4 ++-- .../include/CGAL/Kinetic/IO/internal/Qt_core.h | 4 ++-- .../include/CGAL/Kinetic/IO/internal/Qt_timer.h | 4 ++-- .../CGAL/Kinetic/IO/internal/Qt_widget_2_core.h | 4 ++-- .../include/CGAL/Kinetic/IO/internal/Qt_window_2.h | 4 ++-- .../include/CGAL/Kinetic/IO/internal/pixmaps.h | 4 ++-- .../CGAL/Kinetic/Inexact_simulation_traits.h | 4 ++-- .../include/CGAL/Kinetic/Insert_event.h | 4 ++-- .../include/CGAL/Kinetic/Listener.h | 4 ++-- .../include/CGAL/Kinetic/Multi_listener.h | 4 ++-- .../include/CGAL/Kinetic/Ref_counted.h | 4 ++-- .../include/CGAL/Kinetic/Regular_triangulation_3.h | 4 ++-- ...ar_triangulation_CORE_exact_simulation_traits.h | 4 ++-- .../Kinetic/Regular_triangulation_cell_base_3.h | 4 ++-- .../Regular_triangulation_event_log_visitor_3.h | 4 ++-- ...Regular_triangulation_exact_simulation_traits.h | 4 ++-- ...gular_triangulation_inexact_simulation_traits.h | 4 ++-- .../Regular_triangulation_instantaneous_kernel.h | 4 ++-- .../Kinetic/Regular_triangulation_vertex_base_3.h | 4 ++-- .../Kinetic/Regular_triangulation_visitor_base_3.h | 4 ++-- .../CGAL/Kinetic/Simulator_objects_listener.h | 4 ++-- .../include/CGAL/Kinetic/Sort.h | 4 ++-- .../include/CGAL/Kinetic/Sort_event_log_visitor.h | 4 ++-- .../include/CGAL/Kinetic/Sort_visitor_base.h | 4 ++-- .../include/CGAL/Kinetic/Triangulation_2.h | 4 ++-- .../CGAL/Kinetic/Two_list_pointer_event_queue.h | 4 ++-- .../include/CGAL/Kinetic/basic.h | 4 ++-- .../internal/Delaunay_triangulation_base_3.h | 4 ++-- .../CGAL/Kinetic/internal/Instantaneous_adaptor.h | 4 ++-- .../Kernel/Cartesian_kinetic_kernel_base.h | 4 ++-- .../Kernel/Cartesian_moving_lifted_point_3.h | 4 ++-- .../Kernel/Cartesian_moving_orthosphere_3.h | 4 ++-- .../internal/Kernel/Cartesian_moving_point_1.h | 4 ++-- .../internal/Kernel/Cartesian_moving_point_2.h | 4 ++-- .../internal/Kernel/Cartesian_moving_point_3.h | 4 ++-- .../Kernel/Cartesian_moving_weighted_point_3.h | 4 ++-- .../include/CGAL/Kinetic/internal/Kernel/Center.h | 4 ++-- .../CGAL/Kinetic/internal/Kernel/Certificate.h | 4 ++-- .../internal/Kernel/Delaunay_lifted_lifting.h | 4 ++-- .../Kinetic/internal/Kernel/Delaunay_lifting.h | 4 ++-- .../CGAL/Kinetic/internal/Kernel/Reverse_time.h | 4 ++-- .../internal/Kernel/cartesian_predicates_2.h | 4 ++-- .../internal/Kernel/cartesian_predicates_3.h | 4 ++-- .../include/CGAL/Kinetic/internal/To_static.h | 4 ++-- .../CGAL/Kinetic/internal/Triangulation_helper_3.h | 4 ++-- .../include/CGAL/Kinetic/internal/config.h | 4 ++-- .../include/CGAL/Kinetic/internal/debug_counters.h | 4 ++-- .../CGAL/Kinetic/internal/infinity_or_max.h | 4 ++-- .../include/CGAL/Kinetic/internal/tds_2_helpers.h | 4 ++-- .../Kinetic/internal/triangulation_helpers_3.h | 4 ++-- .../include/CGAL/Kinetic/listeners.h | 4 ++-- .../include/CGAL/Polynomial/CORE_Expr_root_stack.h | 4 ++-- .../include/CGAL/Polynomial/CORE_kernel.h | 4 ++-- .../include/CGAL/Polynomial/Fixed_polynomial.h | 4 ++-- .../include/CGAL/Polynomial/Interval_polynomial.h | 4 ++-- .../include/CGAL/Polynomial/Kernel.h | 4 ++-- .../include/CGAL/Polynomial/Numeric_root_stack.h | 4 ++-- .../include/CGAL/Polynomial/Polynomial.h | 4 ++-- .../CGAL/Polynomial/Root_stack_default_traits.h | 4 ++-- .../include/CGAL/Polynomial/Sturm_root_stack.h | 4 ++-- .../CGAL/Polynomial/Sturm_root_stack_traits.h | 4 ++-- .../include/CGAL/Polynomial/basic.h | 4 ++-- .../CGAL/Polynomial/internal/Alternation_counter.h | 4 ++-- .../CGAL/Polynomial/internal/CORE_polynomial.h | 4 ++-- .../Polynomial/internal/Descartes_root_count.h | 4 ++-- .../Polynomial/internal/Double_with_infinity.h | 4 ++-- .../CGAL/Polynomial/internal/Filtered_function.h | 4 ++-- .../CGAL/Polynomial/internal/Filtered_kernel.h | 4 ++-- .../Filtered_kernel/Filtered_Descartes_has_root.h | 4 ++-- .../Filtered_Descartes_root_counter.h | 4 ++-- .../Filtered_kernel/Filtered_are_negations.h | 4 ++-- .../Filtered_polynomial_rational_kernel.h | 4 ++-- .../Filtered_root_bound_evaluator.h | 4 ++-- .../Filtered_kernel/Filtered_root_multiplicity.h | 4 ++-- .../internal/Filtered_kernel/Filtered_sign_at.h | 4 ++-- .../CGAL/Polynomial/internal/Filtered_number.h | 4 ++-- .../Construct_filtered_function.h | 4 ++-- .../Filtered_Descartes_has_root.h | 4 ++-- .../Filtered_Descartes_root_counter.h | 4 ++-- .../Filtered_rational/Filtered_Sturm_sequence.h | 4 ++-- .../Filtered_rational/Filtered_are_negations.h | 4 ++-- .../Filtered_rational_multiplicity.h | 4 ++-- .../Filtered_rational_sign_above_rational.h | 4 ++-- .../Filtered_rational/Filtered_rational_traits.h | 4 ++-- .../Filtered_root_bound_evaluator.h | 4 ++-- .../Filtered_sign_Sturm_sequence.h | 4 ++-- .../Filtered_rational/Filtered_sign_at_rational.h | 4 ++-- .../Filtered_rational/Filtered_standard_sequence.h | 4 ++-- .../Polynomial/internal/Fixed_polynomial_impl.h | 4 ++-- .../CGAL/Polynomial/internal/GSL_numeric_solver.h | 4 ++-- .../CGAL/Polynomial/internal/Isolating_interval.h | 4 ++-- .../internal/Kernel/Is_even_multiplicity.h | 4 ++-- .../CGAL/Polynomial/internal/Kernel/Is_rational.h | 4 ++-- .../internal/Kernel/Isolating_interval.h | 4 ++-- .../Polynomial/internal/Kernel/Lower_bound_root.h | 4 ++-- .../CGAL/Polynomial/internal/Kernel/Multiplicity.h | 4 ++-- .../internal/Kernel/Rational_between_roots.h | 4 ++-- .../Polynomial/internal/Kernel/Root_container.h | 4 ++-- .../CGAL/Polynomial/internal/Kernel/Sign_above.h | 4 ++-- .../CGAL/Polynomial/internal/Kernel/Sign_at.h | 4 ++-- .../CGAL/Polynomial/internal/Kernel/Sign_below.h | 4 ++-- .../internal/Kernel/Sign_between_roots.h | 4 ++-- .../CGAL/Polynomial/internal/Kernel/To_rational.h | 4 ++-- .../internal/Kernel/predicate_template.h | 4 ++-- .../CGAL/Polynomial/internal/Polynomial_impl.h | 4 ++-- .../Polynomial/internal/Rational/Are_negations.h | 4 ++-- .../internal/Rational/Bezier_root_counter.h | 4 ++-- .../Rational/Compare_isolated_roots_in_interval.h | 4 ++-- .../internal/Rational/Construct_function.h | 4 ++-- .../CGAL/Polynomial/internal/Rational/Derivative.h | 4 ++-- .../internal/Rational/Descartes_has_root.h | 4 ++-- .../internal/Rational/Descartes_root_counter.h | 4 ++-- .../internal/Rational/Euclidean_Sturm_sequence.h | 4 ++-- .../internal/Rational/Evaluate_polynomial.h | 4 ++-- .../Polynomial/internal/Rational/Invert_variable.h | 4 ++-- .../Rational/Map_rational_interval_to_positive.h | 4 ++-- .../internal/Rational/Monic_Sturm_sequence.h | 4 ++-- .../Polynomial/internal/Rational/Negate_variable.h | 4 ++-- .../Rational/Primitive_part_Sturm_sequence.h | 4 ++-- .../Polynomial/internal/Rational/Pseudo_quotient.h | 4 ++-- .../internal/Rational/Pseudo_remainder.h | 4 ++-- .../CGAL/Polynomial/internal/Rational/Quotient.h | 4 ++-- .../internal/Rational/Quotient_remainder.h | 4 ++-- .../internal/Rational/Rational_multiplicity.h | 4 ++-- .../internal/Rational/Rational_traits_base.h | 4 ++-- .../internal/Rational/Rational_translate_zero.h | 4 ++-- .../internal/Rational/Reduced_Sturm_sequence.h | 4 ++-- .../CGAL/Polynomial/internal/Rational/Remainder.h | 4 ++-- .../internal/Rational/Root_bound_evaluator.h | 4 ++-- .../Polynomial/internal/Rational/Shift_power.h | 4 ++-- .../internal/Rational/Sign_Sturm_sequence.h | 4 ++-- .../internal/Rational/Sign_above_rational.h | 4 ++-- .../internal/Rational/Sign_at_rational.h | 4 ++-- .../internal/Rational/Sign_below_rational.h | 4 ++-- .../internal/Rational/Standard_sequence.h | 4 ++-- .../internal/Rational/Sturm_root_counter.h | 4 ++-- .../Polynomial/internal/Rational/Sturm_sequence.h | 4 ++-- .../internal/Rational/Sturm_sequence_base.h | 4 ++-- .../Rational/Subresultant_Sturm_sequence.h | 4 ++-- .../Polynomial/internal/Root_stack_traits_base.h | 4 ++-- .../Polynomial/internal/Sign_variations_counter.h | 4 ++-- .../Polynomial/internal/Simple_interval_root.h | 4 ++-- .../include/CGAL/Polynomial/internal/Statistics.h | 4 ++-- .../Polynomial/internal/Sturm_isolating_interval.h | 4 ++-- .../CGAL/Polynomial/internal/Sturm_root_rep.h | 4 ++-- .../include/CGAL/Polynomial/internal/config.h | 4 ++-- .../internal/filtered_function_leaf_nodes.h | 4 ++-- .../internal/filtered_function_node_bases.h | 4 ++-- .../internal/filtered_function_operation_nodes.h | 4 ++-- .../CGAL/Polynomial/internal/interval_arithmetic.h | 4 ++-- .../include/CGAL/Polynomial/internal/macros.h | 4 ++-- .../CGAL/Polynomial/internal/nt_converters.h | 4 ++-- .../CGAL/Polynomial/internal/numeric_solvers.h | 4 ++-- .../Polynomial/internal/numeric_solvers_support.h | 4 ++-- .../Polynomial/internal/polynomial_generators.h | 4 ++-- .../CGAL/Polynomial/polynomial_converters.h | 4 ++-- .../include/CGAL/Tools/Counter.h | 4 ++-- Kinetic_data_structures/include/CGAL/Tools/Label.h | 4 ++-- Kinetic_data_structures/include/CGAL/Tools/Log.h | 4 ++-- .../include/CGAL/Tools/utility_macros.h | 4 ++-- .../src/CGAL/JAMA_numeric_solver.cpp | 4 ++-- Kinetic_data_structures/src/CGAL/KDS_Log.cpp | 4 ++-- .../src/CGAL/Turkowski_numeric_solver.cpp | 4 ++-- .../src/CGAL/numeric_solvers_support.cpp | 4 ++-- .../src/CGALQt3/Kinetic_Qt_core.cpp | 4 ++-- .../src/CGALQt3/Kinetic_Qt_timer.cpp | 4 ++-- .../src/CGALQt3/Kinetic_Qt_widget_2_core.cpp | 4 ++-- .../src/CGALQt3/Kinetic_Qt_window_2.cpp | 4 ++-- .../src/CGALQt3/Kinetic_faster.xpm | 4 ++-- .../src/CGALQt3/Kinetic_pause.xpm | 4 ++-- .../src/CGALQt3/Kinetic_pixmaps.cpp | 4 ++-- .../src/CGALQt3/Kinetic_play.xpm | 4 ++-- .../src/CGALQt3/Kinetic_play_through.xpm | 4 ++-- .../src/CGALQt3/Kinetic_play_to.xpm | 4 ++-- .../src/CGALQt3/Kinetic_print.xpm | 4 ++-- .../src/CGALQt3/Kinetic_reverse.xpm | 4 ++-- .../src/CGALQt3/Kinetic_slower.xpm | 4 ++-- .../src/CGALQt3/Kinetic_stop.xpm | 4 ++-- LEDA/include/CGAL/LEDA_basic.h | 4 ++-- LEDA/include/CGAL/leda_in_CGAL_2.h | 4 ++-- LEDA/include/CGAL/rat_leda_in_CGAL_2.h | 4 ++-- .../include/CGAL/predicates_on_points_rat_leda_2.h | 4 ++-- LEDA/test/LEDA/include/CGAL/rat_leda.h | 4 ++-- LEDA/test/LEDA/test_with_leda_kernel_2.cpp | 4 ++-- MacOSX/scripts/cgal_make_macosx_app | 4 ++-- Maintenance/MacOSX_Installer/Resources/License.rtf | 2 +- Maintenance/deb/sid/debian/copyright | 14 +++++++------- Maintenance/deb/squeeze/debian/copyright | 14 +++++++------- Maintenance/deb/wheezy/debian/copyright | 14 +++++++------- Maintenance/package_handling/new_headers | 4 ++-- Maintenance/package_handling/new_headers_v2 | 4 ++-- Manual/developer_scripts/cgal_manual | 4 ++-- Mesh_2/demo/Mesh_2/Qt3/Qt_layer_show_circles.h | 4 ++-- .../demo/Mesh_2/Qt3/Qt_layer_show_triangulation.h | 4 ++-- .../Qt3/Qt_layer_show_triangulation_constraints.h | 4 ++-- .../demo/Mesh_2/Qt3/Qt_widget_style_editor-aux.h | 4 ++-- Mesh_2/demo/Mesh_2/Qt3/Qt_widget_style_editor.cpp | 4 ++-- Mesh_2/demo/Mesh_2/Qt3/Qt_widget_style_editor.h | 4 ++-- Mesh_2/demo/Mesh_2/Qt3/Qt_widget_styled_layer.cpp | 4 ++-- Mesh_2/demo/Mesh_2/Qt3/Qt_widget_styled_layer.h | 4 ++-- Mesh_2/demo/Mesh_2/Qt3/Show_clusters.h | 4 ++-- Mesh_2/demo/Mesh_2/Qt3/Show_points.cpp | 4 ++-- Mesh_2/demo/Mesh_2/Qt3/Show_points.h | 4 ++-- Mesh_2/demo/Mesh_2/Qt3/Show_segments.h | 4 ++-- Mesh_2/demo/Mesh_2/Qt3/Show_segments_base.cpp | 4 ++-- Mesh_2/demo/Mesh_2/Qt3/Show_segments_base.h | 4 ++-- Mesh_2/demo/Mesh_2/Qt3/icons.cpp | 4 ++-- Mesh_2/demo/Mesh_2/Qt3/icons.h | 4 ++-- Mesh_2/demo/Mesh_2/Qt3/mesh_2_demo.cpp | 4 ++-- Mesh_2/demo/Mesh_2/conform.cpp | 4 ++-- Mesh_2/demo/Mesh_2/mesh.cpp | 4 ++-- ...backward_compatibility_MeshFoobarCriteria_3.cpp | 4 ++-- Mesh_3/test/Mesh_3/test_boost_has_xxx.cpp | 4 ++-- .../include/CGAL/Min_sphere_annulus_d_traits_2.h | 4 ++-- .../include/CGAL/Min_sphere_annulus_d_traits_3.h | 4 ++-- .../include/CGAL/Min_sphere_annulus_d_traits_d.h | 4 ++-- Modifier/include/CGAL/Modifier_base.h | 4 ++-- .../include/CGAL/Modular_arithmetic/Residue_type.h | 4 ++-- Modular_arithmetic/include/CGAL/Modular_traits.h | 4 ++-- Modular_arithmetic/include/CGAL/Residue.h | 4 ++-- Modular_arithmetic/include/CGAL/primes.h | 4 ++-- Modular_arithmetic/src/CGAL/Residue_type.cpp | 4 ++-- Modular_arithmetic/src/CGAL/primes.cpp | 4 ++-- Nef_2/include/CGAL/Nef_2/Polynomial.h | 4 ++-- Nef_2/include/CGAL/Nef_2/debug.h | 4 ++-- Nef_2/include/CGAL/Nef_polynomial_fwd.h | 4 ++-- Nef_2/src/CGAL/NefPolynomial.cpp | 4 ++-- Nef_S2/include/CGAL/IO/Qt_widget_OpenGL.h | 4 ++-- Nef_S2/include/CGAL/Nef_S2/OGL_base_object.h | 4 ++-- Nef_S2/src/CGALQt3/Qt_widget_OpenGL.cpp | 4 ++-- Number_types/include/CGAL/CORE_BigFloat.h | 4 ++-- Number_types/include/CGAL/CORE_BigInt.h | 4 ++-- Number_types/include/CGAL/CORE_BigRat.h | 4 ++-- Number_types/include/CGAL/CORE_Expr.h | 4 ++-- Number_types/include/CGAL/CORE_coercion_traits.h | 4 ++-- Number_types/include/CGAL/Counted_number.h | 4 ++-- Number_types/include/CGAL/FPU.h | 4 ++-- Number_types/include/CGAL/GMP/Gmpfi_type.h | 4 ++-- Number_types/include/CGAL/GMP/Gmpfi_type_static.h | 4 ++-- Number_types/include/CGAL/GMP/Gmpfr_type.h | 4 ++-- Number_types/include/CGAL/GMP/Gmpfr_type_static.h | 4 ++-- Number_types/include/CGAL/GMP/Gmpq_type.h | 4 ++-- Number_types/include/CGAL/GMP/Gmpz_type.h | 4 ++-- Number_types/include/CGAL/GMP/Gmpzf_type.h | 4 ++-- Number_types/include/CGAL/Gmp_coercion_traits.h | 4 ++-- Number_types/include/CGAL/Gmpfi.h | 4 ++-- Number_types/include/CGAL/Gmpfr.h | 4 ++-- Number_types/include/CGAL/Gmpq.h | 4 ++-- Number_types/include/CGAL/Gmpz.h | 4 ++-- Number_types/include/CGAL/Gmpzf.h | 4 ++-- Number_types/include/CGAL/IEEE_754_unions.h | 4 ++-- Number_types/include/CGAL/Interval_arithmetic.h | 4 ++-- Number_types/include/CGAL/Interval_nt.h | 4 ++-- Number_types/include/CGAL/Lazy_exact_nt.h | 4 ++-- Number_types/include/CGAL/MP_Float.h | 4 ++-- Number_types/include/CGAL/NT_converter.h | 4 ++-- Number_types/include/CGAL/Number_type_checker.h | 4 ++-- .../internal_functions_comparison_root_of_2.h | 4 ++-- Number_types/include/CGAL/Quotient.h | 4 ++-- Number_types/include/CGAL/Quotient_fwd.h | 4 ++-- Number_types/include/CGAL/Root_of_2.h | 4 ++-- Number_types/include/CGAL/Root_of_traits.h | 4 ++-- .../include/CGAL/Root_of_traits_specializations.h | 4 ++-- Number_types/include/CGAL/Sqrt_extension.h | 4 ++-- .../Sqrt_extension/Algebraic_extension_traits.h | 4 ++-- .../Sqrt_extension/Algebraic_structure_traits.h | 4 ++-- .../CGAL/Sqrt_extension/Chinese_remainder_traits.h | 4 ++-- .../include/CGAL/Sqrt_extension/Coercion_traits.h | 4 ++-- .../include/CGAL/Sqrt_extension/Fraction_traits.h | 4 ++-- .../CGAL/Sqrt_extension/Get_arithmetic_kernel.h | 4 ++-- .../include/CGAL/Sqrt_extension/Modular_traits.h | 4 ++-- .../CGAL/Sqrt_extension/Real_embeddable_traits.h | 4 ++-- .../CGAL/Sqrt_extension/Scalar_factor_traits.h | 4 ++-- .../CGAL/Sqrt_extension/Sqrt_extension_type.h | 4 ++-- .../include/CGAL/Sqrt_extension/Wang_traits.h | 4 ++-- .../include/CGAL/Sqrt_extension/convert_to_bfi.h | 4 ++-- Number_types/include/CGAL/Sqrt_extension/io.h | 4 ++-- Number_types/include/CGAL/Sqrt_extension_fwd.h | 4 ++-- Number_types/include/CGAL/constant.h | 4 ++-- Number_types/include/CGAL/double.h | 4 ++-- Number_types/include/CGAL/float.h | 4 ++-- Number_types/include/CGAL/gmp.h | 4 ++-- Number_types/include/CGAL/gmpxx.h | 4 ++-- Number_types/include/CGAL/gmpxx_coercion_traits.h | 4 ++-- Number_types/include/CGAL/int.h | 4 ++-- .../include/CGAL/internal/Exact_type_selector.h | 4 ++-- .../include/CGAL/known_bit_size_integers.h | 4 ++-- Number_types/include/CGAL/leda_bigfloat.h | 4 ++-- Number_types/include/CGAL/leda_bigfloat_interval.h | 4 ++-- Number_types/include/CGAL/leda_coercion_traits.h | 4 ++-- Number_types/include/CGAL/leda_integer.h | 4 ++-- Number_types/include/CGAL/leda_rational.h | 4 ++-- Number_types/include/CGAL/leda_real.h | 4 ++-- Number_types/include/CGAL/long_double.h | 4 ++-- Number_types/include/CGAL/long_long.h | 4 ++-- Number_types/include/CGAL/mpfi_coercion_traits.h | 4 ++-- Number_types/include/CGAL/mpfr_coercion_traits.h | 4 ++-- Number_types/include/CGAL/mpq_class.h | 4 ++-- Number_types/include/CGAL/mpz_class.h | 4 ++-- Number_types/include/CGAL/number_type_basic.h | 4 ++-- .../include/CGAL/simplest_rational_in_interval.h | 4 ++-- Number_types/include/CGAL/sse2.h | 4 ++-- Number_types/include/CGAL/to_rational.h | 4 ++-- Number_types/include/CGAL/utils.h | 4 ++-- Number_types/include/CGAL/utils_classes.h | 4 ++-- Number_types/src/CGAL/Interval_arithmetic.cpp | 4 ++-- Number_types/src/CGAL/MP_Float.cpp | 4 ++-- Number_types/src/CGAL/test_FPU_rounding_mode.cpp | 4 ++-- Number_types/test/Number_types/Gmpfi.cpp | 4 ++-- Number_types/test/Number_types/Gmpfr.cpp | 4 ++-- .../Number_types/_test_valid_finite_double.cpp | 4 ++-- .../test/Number_types/_test_valid_finite_float.cpp | 4 ++-- .../test/Number_types/include/CGAL/_test_io.h | 4 ++-- .../Number_types/include/CGAL/_test_utilities.h | 4 ++-- OpenNL/include/CGAL/OpenNL/bicgstab.h | 2 +- OpenNL/include/CGAL/OpenNL/blas.h | 2 +- OpenNL/include/CGAL/OpenNL/conjugate_gradient.h | 2 +- OpenNL/include/CGAL/OpenNL/full_vector.h | 2 +- OpenNL/include/CGAL/OpenNL/linear_solver.h | 2 +- OpenNL/include/CGAL/OpenNL/preconditioner.h | 2 +- OpenNL/include/CGAL/OpenNL/sparse_matrix.h | 2 +- .../CGAL/Optimisation/Access_coordinates_begin_2.h | 4 ++-- .../CGAL/Optimisation/Access_coordinates_begin_3.h | 4 ++-- .../CGAL/Optimisation/Access_coordinates_begin_d.h | 4 ++-- .../include/CGAL/Optimisation/Access_dimension_2.h | 4 ++-- .../include/CGAL/Optimisation/Access_dimension_3.h | 4 ++-- .../include/CGAL/Optimisation/Access_dimension_d.h | 4 ++-- .../include/CGAL/Optimisation/Construct_point_2.h | 4 ++-- .../include/CGAL/Optimisation/Construct_point_3.h | 4 ++-- .../include/CGAL/Optimisation/Construct_point_d.h | 4 ++-- .../include/CGAL/Optimisation/assertions.h | 4 ++-- .../include/CGAL/Optimisation/basic.h | 4 ++-- .../include/CGAL/Optimisation/debug.h | 4 ++-- .../include/CGAL/Optimisation_d_traits_2.h | 4 ++-- .../include/CGAL/Optimisation_d_traits_3.h | 4 ++-- .../include/CGAL/Optimisation_d_traits_d.h | 4 ++-- Polygon/include/CGAL/Polygon_2.h | 4 ++-- .../CGAL/Polygon_2/Polygon_2_algorithms_impl.h | 4 ++-- .../CGAL/Polygon_2/Polygon_2_edge_circulator.h | 4 ++-- .../CGAL/Polygon_2/Polygon_2_edge_iterator.h | 4 ++-- Polygon/include/CGAL/Polygon_2/Polygon_2_impl.h | 4 ++-- .../include/CGAL/Polygon_2/Polygon_2_simplicity.h | 4 ++-- .../CGAL/Polygon_2/Polygon_2_vertex_circulator.h | 4 ++-- .../include/CGAL/Polygon_2/polygon_assertions.h | 4 ++-- Polygon/include/CGAL/Polygon_2_algorithms.h | 4 ++-- Polygon/include/CGAL/Polygon_traits_2.h | 4 ++-- Polyhedron/demo/Polyhedron/opengl_tools.h | 4 ++-- Polynomial/include/CGAL/Exponent_vector.h | 4 ++-- Polynomial/include/CGAL/Polynomial.h | 4 ++-- .../CGAL/Polynomial/Algebraic_structure_traits.h | 4 ++-- .../Cached_extended_euclidean_algorithm.h | 4 ++-- .../CGAL/Polynomial/Chinese_remainder_traits.h | 4 ++-- .../include/CGAL/Polynomial/Coercion_traits.h | 4 ++-- Polynomial/include/CGAL/Polynomial/Degree.h | 4 ++-- .../include/CGAL/Polynomial/Fraction_traits.h | 4 ++-- .../CGAL/Polynomial/Get_arithmetic_kernel.h | 4 ++-- Polynomial/include/CGAL/Polynomial/Interpolator.h | 4 ++-- .../include/CGAL/Polynomial/Modular_traits.h | 4 ++-- .../CGAL/Polynomial/Monomial_representation.h | 4 ++-- .../include/CGAL/Polynomial/Polynomial_type.h | 4 ++-- .../CGAL/Polynomial/Real_embeddable_traits.h | 4 ++-- .../include/CGAL/Polynomial/Scalar_factor_traits.h | 4 ++-- Polynomial/include/CGAL/Polynomial/Wang_traits.h | 4 ++-- Polynomial/include/CGAL/Polynomial/bezout_matrix.h | 4 ++-- Polynomial/include/CGAL/Polynomial/determinant.h | 4 ++-- Polynomial/include/CGAL/Polynomial/fwd.h | 4 ++-- .../include/CGAL/Polynomial/hgdelta_update.h | 4 ++-- Polynomial/include/CGAL/Polynomial/misc.h | 4 ++-- .../include/CGAL/Polynomial/modular_filter.h | 4 ++-- Polynomial/include/CGAL/Polynomial/modular_gcd.h | 4 ++-- .../CGAL/Polynomial/modular_gcd_utcf_algorithm_M.h | 4 ++-- .../CGAL/Polynomial/modular_gcd_utcf_dfai.h | 4 ++-- .../CGAL/Polynomial/modular_gcd_utcf_pure_wang.h | 4 ++-- .../CGAL/Polynomial/modular_gcd_utcf_with_wang.h | 4 ++-- .../include/CGAL/Polynomial/modular_gcd_utils.h | 4 ++-- .../include/CGAL/Polynomial/polynomial_functions.h | 4 ++-- .../include/CGAL/Polynomial/polynomial_gcd.h | 4 ++-- .../Polynomial/polynomial_gcd_implementations.h | 4 ++-- .../include/CGAL/Polynomial/polynomial_gcd_ntl.h | 4 ++-- Polynomial/include/CGAL/Polynomial/prs_resultant.h | 4 ++-- Polynomial/include/CGAL/Polynomial/resultant.h | 4 ++-- .../CGAL/Polynomial/sturm_habicht_sequence.h | 4 ++-- Polynomial/include/CGAL/Polynomial/subresultants.h | 4 ++-- Polynomial/include/CGAL/Polynomial/wang.h | 4 ++-- Polynomial/include/CGAL/Polynomial_traits_d.h | 4 ++-- .../include/CGAL/Polynomial_type_generator.h | 4 ++-- Polynomial/include/CGAL/polynomial_utils.h | 4 ++-- .../include/CGAL/Polytope_distance_d_traits_2.h | 4 ++-- .../include/CGAL/Polytope_distance_d_traits_3.h | 4 ++-- .../include/CGAL/Polytope_distance_d_traits_d.h | 4 ++-- .../include/CGAL/barycenter.h | 4 ++-- .../include/CGAL/bounding_box.h | 4 ++-- .../include/CGAL/centroid.h | 4 ++-- Principal_component_analysis/include/CGAL/eigen.h | 4 ++-- .../include/CGAL/eigen_2.h | 4 ++-- Profiling_tools/include/CGAL/Memory_sizer.h | 4 ++-- Profiling_tools/include/CGAL/Profile_counter.h | 4 ++-- Profiling_tools/include/CGAL/Profile_timer.h | 4 ++-- Profiling_tools/include/CGAL/Real_timer.h | 4 ++-- Profiling_tools/include/CGAL/Timer.h | 4 ++-- Profiling_tools/src/CGAL/Real_timer.cpp | 4 ++-- Profiling_tools/src/CGAL/Timer.cpp | 4 ++-- Qt_widget/demo/Qt_widget/hellosegment.cpp | 4 ++-- Qt_widget/demo/Qt_widget/layer.cpp | 4 ++-- Qt_widget/demo/Qt_widget/standard_toolbar.cpp | 4 ++-- Qt_widget/demo/Qt_widget/tutorial2.cpp | 4 ++-- Qt_widget/include/CGAL/IO/Custom_zoom_layer.h | 4 ++-- Qt_widget/include/CGAL/IO/Navigation_layer.h | 4 ++-- Qt_widget/include/CGAL/IO/Qt_help_window.h | 4 ++-- Qt_widget/include/CGAL/IO/Qt_widget.h | 4 ++-- .../include/CGAL/IO/Qt_widget_Alpha_shape_2.h | 4 ++-- Qt_widget/include/CGAL/IO/Qt_widget_Conic_2.h | 4 ++-- .../IO/Qt_widget_Constrained_triangulation_2.h | 4 ++-- .../CGAL/IO/Qt_widget_Delaunay_triangulation_2.h | 4 ++-- .../include/CGAL/IO/Qt_widget_Min_ellipse_2.h | 4 ++-- Qt_widget/include/CGAL/IO/Qt_widget_Nef_2.h | 4 ++-- .../CGAL/IO/Qt_widget_Optimisation_circle_2.h | 4 ++-- .../CGAL/IO/Qt_widget_Optimisation_ellipse_2.h | 4 ++-- Qt_widget/include/CGAL/IO/Qt_widget_Polygon_2.h | 4 ++-- .../CGAL/IO/Qt_widget_Regular_triangulation_2.h | 4 ++-- .../include/CGAL/IO/Qt_widget_Triangulation_2.h | 4 ++-- Qt_widget/include/CGAL/IO/Qt_widget_focus.h | 4 ++-- Qt_widget/include/CGAL/IO/Qt_widget_get_circle.h | 4 ++-- .../include/CGAL/IO/Qt_widget_get_iso_rectangle.h | 4 ++-- Qt_widget/include/CGAL/IO/Qt_widget_get_line.h | 4 ++-- Qt_widget/include/CGAL/IO/Qt_widget_get_point.h | 4 ++-- Qt_widget/include/CGAL/IO/Qt_widget_get_polygon.h | 4 ++-- Qt_widget/include/CGAL/IO/Qt_widget_get_segment.h | 4 ++-- .../include/CGAL/IO/Qt_widget_get_simple_polygon.h | 4 ++-- Qt_widget/include/CGAL/IO/Qt_widget_handtool.h | 4 ++-- Qt_widget/include/CGAL/IO/Qt_widget_history.h | 4 ++-- Qt_widget/include/CGAL/IO/Qt_widget_layer.h | 4 ++-- .../include/CGAL/IO/Qt_widget_rotation_layer.h | 4 ++-- .../CGAL/IO/Qt_widget_show_mouse_coordinates.h | 4 ++-- .../include/CGAL/IO/Qt_widget_standard_toolbar.h | 4 ++-- Qt_widget/include/CGAL/IO/Qt_widget_zoomrect.h | 4 ++-- Qt_widget/include/CGAL/IO/pixmaps/alpha_shape.xpm | 4 ++-- Qt_widget/include/CGAL/IO/pixmaps/arrow.xpm | 4 ++-- Qt_widget/include/CGAL/IO/pixmaps/back.xpm | 4 ++-- Qt_widget/include/CGAL/IO/pixmaps/circle.xpm | 4 ++-- Qt_widget/include/CGAL/IO/pixmaps/constrained.xpm | 4 ++-- Qt_widget/include/CGAL/IO/pixmaps/demoicon.xpm | 4 ++-- Qt_widget/include/CGAL/IO/pixmaps/focus.xpm | 4 ++-- Qt_widget/include/CGAL/IO/pixmaps/focus1.xpm | 4 ++-- Qt_widget/include/CGAL/IO/pixmaps/focus1_mask.xpm | 4 ++-- Qt_widget/include/CGAL/IO/pixmaps/focus2.xpm | 4 ++-- Qt_widget/include/CGAL/IO/pixmaps/focus2_mask.xpm | 4 ++-- Qt_widget/include/CGAL/IO/pixmaps/focus3.xpm | 4 ++-- Qt_widget/include/CGAL/IO/pixmaps/focus3_mask.xpm | 4 ++-- Qt_widget/include/CGAL/IO/pixmaps/forward.xpm | 4 ++-- .../include/CGAL/IO/pixmaps/greene_approx.xpm | 4 ++-- Qt_widget/include/CGAL/IO/pixmaps/hand.xpm | 4 ++-- Qt_widget/include/CGAL/IO/pixmaps/handtool.xpm | 4 ++-- Qt_widget/include/CGAL/IO/pixmaps/holddown.xpm | 4 ++-- .../include/CGAL/IO/pixmaps/iso_rectangle.xpm | 4 ++-- Qt_widget/include/CGAL/IO/pixmaps/line.xpm | 4 ++-- .../include/CGAL/IO/pixmaps/min_parallelogram.xpm | 4 ++-- .../include/CGAL/IO/pixmaps/min_rectangle.xpm | 4 ++-- Qt_widget/include/CGAL/IO/pixmaps/mouse_coord.xpm | 4 ++-- Qt_widget/include/CGAL/IO/pixmaps/movepoint.xpm | 4 ++-- .../include/CGAL/IO/pixmaps/nearest_vertex.xpm | 4 ++-- Qt_widget/include/CGAL/IO/pixmaps/notool.xpm | 4 ++-- .../include/CGAL/IO/pixmaps/optimal_convex.xpm | 4 ++-- Qt_widget/include/CGAL/IO/pixmaps/point.xpm | 4 ++-- Qt_widget/include/CGAL/IO/pixmaps/points.xpm | 4 ++-- Qt_widget/include/CGAL/IO/pixmaps/polygon.xpm | 4 ++-- Qt_widget/include/CGAL/IO/pixmaps/rotation.xpm | 4 ++-- Qt_widget/include/CGAL/IO/pixmaps/show_polygon.xpm | 4 ++-- .../include/CGAL/IO/pixmaps/triangulation.xpm | 4 ++-- Qt_widget/include/CGAL/IO/pixmaps/voronoi.xpm | 4 ++-- Qt_widget/include/CGAL/IO/pixmaps/ymonotone.xpm | 4 ++-- Qt_widget/include/CGAL/IO/pixmaps/zoom_in.xpm | 4 ++-- Qt_widget/include/CGAL/IO/pixmaps/zoom_in_rect.xpm | 4 ++-- Qt_widget/include/CGAL/IO/pixmaps/zoom_out.xpm | 4 ++-- Qt_widget/src/CGALQt3/Qt_help_window.cpp | 4 ++-- Qt_widget/src/CGALQt3/Qt_widget.cpp | 4 ++-- Qt_widget/src/CGALQt3/Qt_widget_history.cpp | 4 ++-- Qt_widget/src/CGALQt3/Qt_widget_layer.cpp | 4 ++-- .../src/CGALQt3/Qt_widget_standard_toolbar.cpp | 4 ++-- Qt_widget/src/CGALQt3/Qt_widget_xpm_icons.cpp | 4 ++-- Random_numbers/include/CGAL/Random.h | 4 ++-- Random_numbers/src/CGAL/Random.cpp | 4 ++-- Robustness/demo/Robustness/cgal_types.h | 4 ++-- Robustness/demo/Robustness/robustness.cpp | 4 ++-- STL_Extension/include/CGAL/Cache.h | 4 ++-- STL_Extension/include/CGAL/Circulator_identity.h | 4 ++-- STL_Extension/include/CGAL/Circulator_on_node.h | 4 ++-- STL_Extension/include/CGAL/Circulator_project.h | 4 ++-- STL_Extension/include/CGAL/Compact_container.h | 4 ++-- STL_Extension/include/CGAL/Complexity_tags.h | 4 ++-- STL_Extension/include/CGAL/Concatenate_iterator.h | 4 ++-- STL_Extension/include/CGAL/Counting_iterator.h | 4 ++-- STL_Extension/include/CGAL/Default.h | 4 ++-- STL_Extension/include/CGAL/Flattening_iterator.h | 4 ++-- STL_Extension/include/CGAL/Fourtuple.h | 4 ++-- STL_Extension/include/CGAL/Handle.h | 4 ++-- STL_Extension/include/CGAL/Handle_for.h | 4 ++-- STL_Extension/include/CGAL/Handle_for_virtual.h | 4 ++-- STL_Extension/include/CGAL/Handle_with_policy.h | 4 ++-- STL_Extension/include/CGAL/In_place_list.h | 4 ++-- STL_Extension/include/CGAL/Inverse_index.h | 4 ++-- STL_Extension/include/CGAL/Iterator_identity.h | 4 ++-- STL_Extension/include/CGAL/Iterator_project.h | 4 ++-- STL_Extension/include/CGAL/Iterator_transform.h | 4 ++-- STL_Extension/include/CGAL/Join_input_iterator.h | 4 ++-- STL_Extension/include/CGAL/Location_policy.h | 4 ++-- .../include/CGAL/Modifiable_priority_queue.h | 4 ++-- STL_Extension/include/CGAL/Multiset.h | 4 ++-- STL_Extension/include/CGAL/N_step_adaptor.h | 4 ++-- .../include/CGAL/N_step_adaptor_derived.h | 4 ++-- STL_Extension/include/CGAL/Nested_iterator.h | 4 ++-- STL_Extension/include/CGAL/Object.h | 4 ++-- STL_Extension/include/CGAL/Random_access_adaptor.h | 4 ++-- .../include/CGAL/Random_access_value_adaptor.h | 4 ++-- STL_Extension/include/CGAL/Sixtuple.h | 4 ++-- STL_Extension/include/CGAL/Threetuple.h | 4 ++-- STL_Extension/include/CGAL/Twotuple.h | 4 ++-- STL_Extension/include/CGAL/Uncertain.h | 4 ++-- STL_Extension/include/CGAL/algorithm.h | 4 ++-- STL_Extension/include/CGAL/array.h | 4 ++-- STL_Extension/include/CGAL/assertions.h | 4 ++-- STL_Extension/include/CGAL/assertions_behaviour.h | 4 ++-- STL_Extension/include/CGAL/copy_n.h | 4 ++-- STL_Extension/include/CGAL/exceptions.h | 4 ++-- STL_Extension/include/CGAL/function_objects.h | 4 ++-- .../include/CGAL/internal/boost/property_map.h | 4 ++-- STL_Extension/include/CGAL/is_convertible.h | 4 ++-- STL_Extension/include/CGAL/is_iterator.h | 4 ++-- STL_Extension/include/CGAL/iterator.h | 4 ++-- STL_Extension/include/CGAL/memory.h | 4 ++-- STL_Extension/include/CGAL/min_max_n.h | 4 ++-- STL_Extension/include/CGAL/multiset_assertions.h | 4 ++-- STL_Extension/include/CGAL/tags.h | 4 ++-- STL_Extension/include/CGAL/tuple.h | 4 ++-- STL_Extension/include/CGAL/type_traits.h | 4 ++-- STL_Extension/include/CGAL/utility.h | 4 ++-- STL_Extension/include/CGAL/vector.h | 4 ++-- STL_Extension/src/CGAL/assertions.cpp | 4 ++-- Scripts/developer_scripts/check_licenses | 4 ++-- Scripts/developer_scripts/create_internal_release | 4 ++-- Scripts/developer_scripts/list_cgal_includes | 4 ++-- Scripts/scripts/cgal_create_assertions.sh | 4 ++-- Scripts/scripts/cgal_create_cmake_script | 4 ++-- .../scripts/cgal_create_cmake_script_with_options | 4 ++-- Spatial_sorting/include/CGAL/Hilbert_policy_tags.h | 4 ++-- Spatial_sorting/include/CGAL/Hilbert_sort_2.h | 4 ++-- Spatial_sorting/include/CGAL/Hilbert_sort_3.h | 4 ++-- Spatial_sorting/include/CGAL/Hilbert_sort_base.h | 4 ++-- Spatial_sorting/include/CGAL/Hilbert_sort_d.h | 4 ++-- .../include/CGAL/Hilbert_sort_median_2.h | 4 ++-- .../include/CGAL/Hilbert_sort_median_3.h | 4 ++-- .../include/CGAL/Hilbert_sort_median_d.h | 4 ++-- .../include/CGAL/Hilbert_sort_middle_2.h | 4 ++-- .../include/CGAL/Hilbert_sort_middle_3.h | 4 ++-- .../include/CGAL/Hilbert_sort_middle_base.h | 4 ++-- .../include/CGAL/Hilbert_sort_middle_d.h | 4 ++-- Spatial_sorting/include/CGAL/Multiscale_sort.h | 4 ++-- .../include/CGAL/Spatial_sort_traits_adapter_2.h | 4 ++-- .../include/CGAL/Spatial_sort_traits_adapter_3.h | 4 ++-- .../include/CGAL/Spatial_sort_traits_adapter_d.h | 4 ++-- Spatial_sorting/include/CGAL/hilbert_sort.h | 4 ++-- Spatial_sorting/include/CGAL/spatial_sort.h | 4 ++-- Straight_skeleton_2/include/CGAL/IO/Dxf_stream.h | 4 ++-- Straight_skeleton_2/include/CGAL/IO/Dxf_writer.h | 4 ++-- .../include/CGAL/certified_numeric_predicates.h | 4 ++-- .../include/CGAL/certified_quotient_predicates.h | 4 ++-- Stream_support/include/CGAL/IO/File_header_OFF.h | 4 ++-- .../include/CGAL/IO/File_header_extended_OFF.h | 4 ++-- Stream_support/include/CGAL/IO/File_header_gocad.h | 4 ++-- Stream_support/include/CGAL/IO/File_scanner_OFF.h | 4 ++-- Stream_support/include/CGAL/IO/File_writer_OFF.h | 4 ++-- .../include/CGAL/IO/File_writer_VRML_2.h | 4 ++-- Stream_support/include/CGAL/IO/File_writer_gocad.h | 4 ++-- .../include/CGAL/IO/File_writer_inventor.h | 4 ++-- .../include/CGAL/IO/File_writer_wavefront.h | 4 ++-- Stream_support/include/CGAL/IO/Generic_writer.h | 4 ++-- Stream_support/include/CGAL/IO/Istream_iterator.h | 4 ++-- Stream_support/include/CGAL/IO/Ostream_iterator.h | 4 ++-- Stream_support/include/CGAL/IO/Scanner_OFF.h | 4 ++-- Stream_support/include/CGAL/IO/Verbose_ostream.h | 4 ++-- Stream_support/include/CGAL/IO/Writer_OFF.h | 4 ++-- Stream_support/include/CGAL/IO/binary_file_io.h | 4 ++-- Stream_support/include/CGAL/IO/generic_copy_OFF.h | 4 ++-- Stream_support/src/CGAL/File_header_OFF.cpp | 4 ++-- .../src/CGAL/File_header_extended_OFF.cpp | 4 ++-- Stream_support/src/CGAL/File_scanner_OFF.cpp | 4 ++-- Stream_support/src/CGAL/File_writer_OFF.cpp | 4 ++-- Stream_support/src/CGAL/File_writer_VRML_2.cpp | 4 ++-- Stream_support/src/CGAL/File_writer_inventor.cpp | 4 ++-- Stream_support/src/CGAL/File_writer_wavefront.cpp | 4 ++-- .../include/CGAL/Polyhedron_decorator_3.h | 4 ++-- .../include/CGAL/Subdivision_mask_3.h | 4 ++-- .../include/CGAL/Subdivision_method_3.h | 4 ++-- .../include/CGAL/Subdivision_method_impl_3.h | 4 ++-- .../include/CGAL/Surface_mesher/Profile_counter.h | 4 ++-- Testsuite/include/CGAL/Testsuite/use.h | 4 ++-- Testsuite/include/CGAL/Testsuite/vc_debug_hook.h | 4 ++-- Triangulation_2/include/CGAL/apply_to_range.h | 4 ++-- Union_find/include/CGAL/Union_find.h | 4 ++-- copyright | 2 +- iostream/include/CGAL/IO/Color.h | 4 ++-- iostream/include/CGAL/IO/io.h | 4 ++-- iostream/include/CGAL/IO/io_tags.h | 4 ++-- iostream/src/CGAL/Color.cpp | 4 ++-- iostream/src/CGAL/io.cpp | 4 ++-- 1389 files changed, 2784 insertions(+), 2784 deletions(-) diff --git a/Algebraic_foundations/include/CGAL/Algebraic_extension_traits.h b/Algebraic_foundations/include/CGAL/Algebraic_extension_traits.h index b930dd48810..f9020e57163 100644 --- a/Algebraic_foundations/include/CGAL/Algebraic_extension_traits.h +++ b/Algebraic_foundations/include/CGAL/Algebraic_extension_traits.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_foundations/include/CGAL/Algebraic_structure_traits.h b/Algebraic_foundations/include/CGAL/Algebraic_structure_traits.h index 804aeefb0a9..00d3252e995 100644 --- a/Algebraic_foundations/include/CGAL/Algebraic_structure_traits.h +++ b/Algebraic_foundations/include/CGAL/Algebraic_structure_traits.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_foundations/include/CGAL/Chinese_remainder_traits.h b/Algebraic_foundations/include/CGAL/Chinese_remainder_traits.h index dd4285c776b..d2885520110 100644 --- a/Algebraic_foundations/include/CGAL/Chinese_remainder_traits.h +++ b/Algebraic_foundations/include/CGAL/Chinese_remainder_traits.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_foundations/include/CGAL/Coercion_traits.h b/Algebraic_foundations/include/CGAL/Coercion_traits.h index 6a8ee091f53..331911d4506 100644 --- a/Algebraic_foundations/include/CGAL/Coercion_traits.h +++ b/Algebraic_foundations/include/CGAL/Coercion_traits.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_foundations/include/CGAL/Fraction_traits.h b/Algebraic_foundations/include/CGAL/Fraction_traits.h index ffb29478a91..da94c1535fc 100644 --- a/Algebraic_foundations/include/CGAL/Fraction_traits.h +++ b/Algebraic_foundations/include/CGAL/Fraction_traits.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_foundations/include/CGAL/Needs_parens_as_product.h b/Algebraic_foundations/include/CGAL/Needs_parens_as_product.h index 7ee12bf8b79..99cda86418a 100644 --- a/Algebraic_foundations/include/CGAL/Needs_parens_as_product.h +++ b/Algebraic_foundations/include/CGAL/Needs_parens_as_product.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_foundations/include/CGAL/Rational_traits.h b/Algebraic_foundations/include/CGAL/Rational_traits.h index 033037d9986..45e42aa914c 100644 --- a/Algebraic_foundations/include/CGAL/Rational_traits.h +++ b/Algebraic_foundations/include/CGAL/Rational_traits.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_foundations/include/CGAL/Real_embeddable_traits.h b/Algebraic_foundations/include/CGAL/Real_embeddable_traits.h index ea965a590f4..21e6d18a4ec 100644 --- a/Algebraic_foundations/include/CGAL/Real_embeddable_traits.h +++ b/Algebraic_foundations/include/CGAL/Real_embeddable_traits.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_foundations/include/CGAL/Scalar_factor_traits.h b/Algebraic_foundations/include/CGAL/Scalar_factor_traits.h index f59315ccb4d..39055e66dd0 100644 --- a/Algebraic_foundations/include/CGAL/Scalar_factor_traits.h +++ b/Algebraic_foundations/include/CGAL/Scalar_factor_traits.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_foundations/include/CGAL/Test/_test_algebraic_structure.h b/Algebraic_foundations/include/CGAL/Test/_test_algebraic_structure.h index 69de72f17d8..5b5552eb5af 100644 --- a/Algebraic_foundations/include/CGAL/Test/_test_algebraic_structure.h +++ b/Algebraic_foundations/include/CGAL/Test/_test_algebraic_structure.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_foundations/include/CGAL/Test/_test_coercion_traits.h b/Algebraic_foundations/include/CGAL/Test/_test_coercion_traits.h index eb75d48dbc2..959d50489a3 100644 --- a/Algebraic_foundations/include/CGAL/Test/_test_coercion_traits.h +++ b/Algebraic_foundations/include/CGAL/Test/_test_coercion_traits.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_foundations/include/CGAL/Test/_test_fraction_traits.h b/Algebraic_foundations/include/CGAL/Test/_test_fraction_traits.h index 22d11d8da5e..1aae26c361f 100644 --- a/Algebraic_foundations/include/CGAL/Test/_test_fraction_traits.h +++ b/Algebraic_foundations/include/CGAL/Test/_test_fraction_traits.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_foundations/include/CGAL/Test/_test_rational_traits.h b/Algebraic_foundations/include/CGAL/Test/_test_rational_traits.h index a02703146d0..8d09b07e052 100644 --- a/Algebraic_foundations/include/CGAL/Test/_test_rational_traits.h +++ b/Algebraic_foundations/include/CGAL/Test/_test_rational_traits.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_foundations/include/CGAL/Test/_test_real_embeddable.h b/Algebraic_foundations/include/CGAL/Test/_test_real_embeddable.h index 6cc9a5854e0..dc82786cfd6 100644 --- a/Algebraic_foundations/include/CGAL/Test/_test_real_embeddable.h +++ b/Algebraic_foundations/include/CGAL/Test/_test_real_embeddable.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_foundations/include/CGAL/extended_euclidean_algorithm.h b/Algebraic_foundations/include/CGAL/extended_euclidean_algorithm.h index e0ac0734d64..a4a5875b9bd 100644 --- a/Algebraic_foundations/include/CGAL/extended_euclidean_algorithm.h +++ b/Algebraic_foundations/include/CGAL/extended_euclidean_algorithm.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_foundations/include/CGAL/ipower.h b/Algebraic_foundations/include/CGAL/ipower.h index acb6f69d42e..5908be86d37 100644 --- a/Algebraic_foundations/include/CGAL/ipower.h +++ b/Algebraic_foundations/include/CGAL/ipower.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_foundations/include/CGAL/number_utils.h b/Algebraic_foundations/include/CGAL/number_utils.h index 811de31b3ff..aff2dbe2be2 100644 --- a/Algebraic_foundations/include/CGAL/number_utils.h +++ b/Algebraic_foundations/include/CGAL/number_utils.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_foundations/include/CGAL/number_utils_classes.h b/Algebraic_foundations/include/CGAL/number_utils_classes.h index 5495a2e30c9..bdb7a96701a 100644 --- a/Algebraic_foundations/include/CGAL/number_utils_classes.h +++ b/Algebraic_foundations/include/CGAL/number_utils_classes.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_foundations/test/Algebraic_foundations/extended_euclidean_algorithm.cpp b/Algebraic_foundations/test/Algebraic_foundations/extended_euclidean_algorithm.cpp index ddb930f6b45..09774b428e7 100644 --- a/Algebraic_foundations/test/Algebraic_foundations/extended_euclidean_algorithm.cpp +++ b/Algebraic_foundations/test/Algebraic_foundations/extended_euclidean_algorithm.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_foundations/test/Algebraic_foundations/ipower.cpp b/Algebraic_foundations/test/Algebraic_foundations/ipower.cpp index e1d088d18fc..2c149f740bf 100644 --- a/Algebraic_foundations/test/Algebraic_foundations/ipower.cpp +++ b/Algebraic_foundations/test/Algebraic_foundations/ipower.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Algebraic_curve_kernel_2.h b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Algebraic_curve_kernel_2.h index a21eb739874..a2f12d45d5c 100644 --- a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Algebraic_curve_kernel_2.h +++ b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Algebraic_curve_kernel_2.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Algebraic_real_d_1.h b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Algebraic_real_d_1.h index dd9acd7a37b..becf51aa418 100644 --- a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Algebraic_real_d_1.h +++ b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Algebraic_real_d_1.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Algebraic_real_quadratic_refinement_rep_bfi.h b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Algebraic_real_quadratic_refinement_rep_bfi.h index 445ef5b7375..2f73b8e55d3 100644 --- a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Algebraic_real_quadratic_refinement_rep_bfi.h +++ b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Algebraic_real_quadratic_refinement_rep_bfi.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Algebraic_real_rep.h b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Algebraic_real_rep.h index 1e27b73ced6..b7f46836213 100644 --- a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Algebraic_real_rep.h +++ b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Algebraic_real_rep.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Algebraic_real_rep_bfi.h b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Algebraic_real_rep_bfi.h index c02109011da..598cd873fb0 100644 --- a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Algebraic_real_rep_bfi.h +++ b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Algebraic_real_rep_bfi.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Bitstream_coefficient_kernel.h b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Bitstream_coefficient_kernel.h index 5f5e99f5378..fdf1b4715c1 100644 --- a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Bitstream_coefficient_kernel.h +++ b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Bitstream_coefficient_kernel.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Bitstream_coefficient_kernel_at_alpha.h b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Bitstream_coefficient_kernel_at_alpha.h index ad6b00e0107..41162d25745 100644 --- a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Bitstream_coefficient_kernel_at_alpha.h +++ b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Bitstream_coefficient_kernel_at_alpha.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Bitstream_descartes.h b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Bitstream_descartes.h index f51d1dc4a9d..f5095fd53be 100644 --- a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Bitstream_descartes.h +++ b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Bitstream_descartes.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Bitstream_descartes_E08_tree.h b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Bitstream_descartes_E08_tree.h index 9657745c326..5367ebd10e8 100644 --- a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Bitstream_descartes_E08_tree.h +++ b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Bitstream_descartes_E08_tree.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Bitstream_descartes_rndl_tree.h b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Bitstream_descartes_rndl_tree.h index 3f9d97d5ca2..5453604a16a 100644 --- a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Bitstream_descartes_rndl_tree.h +++ b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Bitstream_descartes_rndl_tree.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Bitstream_descartes_rndl_tree_traits.h b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Bitstream_descartes_rndl_tree_traits.h index 0455d14f0ee..e8d3c27246f 100644 --- a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Bitstream_descartes_rndl_tree_traits.h +++ b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Bitstream_descartes_rndl_tree_traits.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Curve_analysis_2.h b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Curve_analysis_2.h index 447e2a6390e..a788dfc8bf6 100644 --- a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Curve_analysis_2.h +++ b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Curve_analysis_2.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Curve_pair_analysis_2.h b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Curve_pair_analysis_2.h index 4537e8782ec..80a4499218e 100644 --- a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Curve_pair_analysis_2.h +++ b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Curve_pair_analysis_2.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Descartes.h b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Descartes.h index 04a4e5deeb9..08f1b9e035f 100644 --- a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Descartes.h +++ b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Descartes.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Event_line_builder.h b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Event_line_builder.h index e814ea082ae..c30a590d384 100644 --- a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Event_line_builder.h +++ b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Event_line_builder.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Float_traits.h b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Float_traits.h index 99a48547f5c..7733de308a3 100644 --- a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Float_traits.h +++ b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Float_traits.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Interval_evaluate_1.h b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Interval_evaluate_1.h index 44565a75470..321e3292822 100644 --- a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Interval_evaluate_1.h +++ b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Interval_evaluate_1.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Interval_evaluate_2.h b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Interval_evaluate_2.h index b801d1c4d46..8d3e3bb7997 100644 --- a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Interval_evaluate_2.h +++ b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Interval_evaluate_2.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/LRU_hashed_map.h b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/LRU_hashed_map.h index ba0a8cb055d..c29a596d95b 100644 --- a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/LRU_hashed_map.h +++ b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/LRU_hashed_map.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Real_embeddable_extension.h b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Real_embeddable_extension.h index fca153f8149..2438fd07f0b 100644 --- a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Real_embeddable_extension.h +++ b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Real_embeddable_extension.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Real_roots.h b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Real_roots.h index 69aafc148f5..30f71962415 100644 --- a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Real_roots.h +++ b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Real_roots.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Shear_controller.h b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Shear_controller.h index 394c9a4ce04..9060bdf274e 100644 --- a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Shear_controller.h +++ b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Shear_controller.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Shear_transformation.h b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Shear_transformation.h index 010469ce3d7..b47a9b672ba 100644 --- a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Shear_transformation.h +++ b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Shear_transformation.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Status_line_CA_1.h b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Status_line_CA_1.h index 2c8223bed19..9deaa18c208 100644 --- a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Status_line_CA_1.h +++ b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Status_line_CA_1.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Status_line_CPA_1.h b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Status_line_CPA_1.h index d6f240a2df1..c1b0dbc6295 100644 --- a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Status_line_CPA_1.h +++ b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Status_line_CPA_1.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Xy_coordinate_2.h b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Xy_coordinate_2.h index 4f9d20d497c..da6810668a3 100644 --- a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Xy_coordinate_2.h +++ b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Xy_coordinate_2.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/algebraic_curve_kernel_2_tools.h b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/algebraic_curve_kernel_2_tools.h index 45988ddb0bd..6941968602f 100644 --- a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/algebraic_curve_kernel_2_tools.h +++ b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/algebraic_curve_kernel_2_tools.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/bound_between_1.h b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/bound_between_1.h index 7cd5e19fb36..965a09c3832 100644 --- a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/bound_between_1.h +++ b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/bound_between_1.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/construct_binary.h b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/construct_binary.h index f93ad404f6e..d03f18d5643 100644 --- a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/construct_binary.h +++ b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/construct_binary.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/enums.h b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/enums.h index 2f148178018..aa75a283bed 100644 --- a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/enums.h +++ b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/enums.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/exceptions.h b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/exceptions.h index 9403f448921..b112e78c3c3 100644 --- a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/exceptions.h +++ b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/exceptions.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/flags.h b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/flags.h index 395026340f2..90844a525fc 100644 --- a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/flags.h +++ b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/flags.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/macros.h b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/macros.h index 5e0e0365160..7da3820377e 100644 --- a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/macros.h +++ b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/macros.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/refine_zero_against.h b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/refine_zero_against.h index e632d42c67b..23a10bb43f3 100644 --- a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/refine_zero_against.h +++ b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/refine_zero_against.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/shear.h b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/shear.h index c24036354af..fb4696ac0e2 100644 --- a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/shear.h +++ b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/shear.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/univariate_polynomial_utils.h b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/univariate_polynomial_utils.h index 2b9fefd5831..67396a86de7 100644 --- a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/univariate_polynomial_utils.h +++ b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/univariate_polynomial_utils.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d_1.h b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d_1.h index 97ccf39178a..109fbd9a4c3 100644 --- a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d_1.h +++ b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d_1.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d_2.h b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d_2.h index 47d8cf29dca..42a3800879f 100644 --- a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d_2.h +++ b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d_2.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_rs_gmpq_d_1.h b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_rs_gmpq_d_1.h index eeea2e078a2..9035d11131a 100644 --- a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_rs_gmpq_d_1.h +++ b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_rs_gmpq_d_1.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_rs_gmpz_d_1.h b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_rs_gmpz_d_1.h index bb4ffc767c3..cb0d3221493 100644 --- a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_rs_gmpz_d_1.h +++ b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_rs_gmpz_d_1.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/RS/Algebraic_kernel_rs_1.h b/Algebraic_kernel_d/include/CGAL/RS/Algebraic_kernel_rs_1.h index 71a7aa02724..c036cda77b6 100644 --- a/Algebraic_kernel_d/include/CGAL/RS/Algebraic_kernel_rs_1.h +++ b/Algebraic_kernel_d/include/CGAL/RS/Algebraic_kernel_rs_1.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/RS/algebraic_1.h b/Algebraic_kernel_d/include/CGAL/RS/algebraic_1.h index e1d9ab0fc48..ce5d9fba2ed 100644 --- a/Algebraic_kernel_d/include/CGAL/RS/algebraic_1.h +++ b/Algebraic_kernel_d/include/CGAL/RS/algebraic_1.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/RS/algebraic_1_comparisons.h b/Algebraic_kernel_d/include/CGAL/RS/algebraic_1_comparisons.h index 04c1304f546..b525c0e667a 100644 --- a/Algebraic_kernel_d/include/CGAL/RS/algebraic_1_comparisons.h +++ b/Algebraic_kernel_d/include/CGAL/RS/algebraic_1_comparisons.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/RS/algebraic_1_constructors.h b/Algebraic_kernel_d/include/CGAL/RS/algebraic_1_constructors.h index 8494573a507..c7cffd20372 100644 --- a/Algebraic_kernel_d/include/CGAL/RS/algebraic_1_constructors.h +++ b/Algebraic_kernel_d/include/CGAL/RS/algebraic_1_constructors.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/RS/algebraic_1_member.h b/Algebraic_kernel_d/include/CGAL/RS/algebraic_1_member.h index 3a3224de7f6..66d36fa6d0d 100644 --- a/Algebraic_kernel_d/include/CGAL/RS/algebraic_1_member.h +++ b/Algebraic_kernel_d/include/CGAL/RS/algebraic_1_member.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/RS/algebraic_1_operators.h b/Algebraic_kernel_d/include/CGAL/RS/algebraic_1_operators.h index 3e93a448ce2..e8fd3c65ae6 100644 --- a/Algebraic_kernel_d/include/CGAL/RS/algebraic_1_operators.h +++ b/Algebraic_kernel_d/include/CGAL/RS/algebraic_1_operators.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/RS/algebraic_1_other.h b/Algebraic_kernel_d/include/CGAL/RS/algebraic_1_other.h index b3321d75246..248b0bdb4ac 100644 --- a/Algebraic_kernel_d/include/CGAL/RS/algebraic_1_other.h +++ b/Algebraic_kernel_d/include/CGAL/RS/algebraic_1_other.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/RS/algebraic_1_real_embeddable.h b/Algebraic_kernel_d/include/CGAL/RS/algebraic_1_real_embeddable.h index 2f09aefa50e..2ee20e75c83 100644 --- a/Algebraic_kernel_d/include/CGAL/RS/algebraic_1_real_embeddable.h +++ b/Algebraic_kernel_d/include/CGAL/RS/algebraic_1_real_embeddable.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/RS/basic.h b/Algebraic_kernel_d/include/CGAL/RS/basic.h index 4ae47e4c3a8..d93e990f09c 100644 --- a/Algebraic_kernel_d/include/CGAL/RS/basic.h +++ b/Algebraic_kernel_d/include/CGAL/RS/basic.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/RS/compare_1.h b/Algebraic_kernel_d/include/CGAL/RS/compare_1.h index 3ab41b68306..c1242579803 100644 --- a/Algebraic_kernel_d/include/CGAL/RS/compare_1.h +++ b/Algebraic_kernel_d/include/CGAL/RS/compare_1.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/RS/crt.h b/Algebraic_kernel_d/include/CGAL/RS/crt.h index 03c66b27cc8..9820b48eb31 100644 --- a/Algebraic_kernel_d/include/CGAL/RS/crt.h +++ b/Algebraic_kernel_d/include/CGAL/RS/crt.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/RS/dyadic.h b/Algebraic_kernel_d/include/CGAL/RS/dyadic.h index 44f4615958b..a2017277fb9 100644 --- a/Algebraic_kernel_d/include/CGAL/RS/dyadic.h +++ b/Algebraic_kernel_d/include/CGAL/RS/dyadic.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/RS/functors_1.h b/Algebraic_kernel_d/include/CGAL/RS/functors_1.h index efb23eff8cf..e3b840da107 100644 --- a/Algebraic_kernel_d/include/CGAL/RS/functors_1.h +++ b/Algebraic_kernel_d/include/CGAL/RS/functors_1.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/RS/inverse.h b/Algebraic_kernel_d/include/CGAL/RS/inverse.h index 6ae422e0429..76dcb3eae68 100644 --- a/Algebraic_kernel_d/include/CGAL/RS/inverse.h +++ b/Algebraic_kernel_d/include/CGAL/RS/inverse.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/RS/isolator_1.h b/Algebraic_kernel_d/include/CGAL/RS/isolator_1.h index ec18c266535..a2e6b524079 100644 --- a/Algebraic_kernel_d/include/CGAL/RS/isolator_1.h +++ b/Algebraic_kernel_d/include/CGAL/RS/isolator_1.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/RS/isole_1.h b/Algebraic_kernel_d/include/CGAL/RS/isole_1.h index 407a80f5694..4196d01d182 100644 --- a/Algebraic_kernel_d/include/CGAL/RS/isole_1.h +++ b/Algebraic_kernel_d/include/CGAL/RS/isole_1.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/RS/memory.h b/Algebraic_kernel_d/include/CGAL/RS/memory.h index ef06264f5bd..acf185ba61f 100644 --- a/Algebraic_kernel_d/include/CGAL/RS/memory.h +++ b/Algebraic_kernel_d/include/CGAL/RS/memory.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/RS/p.h b/Algebraic_kernel_d/include/CGAL/RS/p.h index c593763169f..323e3530d4e 100644 --- a/Algebraic_kernel_d/include/CGAL/RS/p.h +++ b/Algebraic_kernel_d/include/CGAL/RS/p.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/RS/pagealloc.h b/Algebraic_kernel_d/include/CGAL/RS/pagealloc.h index 3d8b411dabb..1e395f4b313 100644 --- a/Algebraic_kernel_d/include/CGAL/RS/pagealloc.h +++ b/Algebraic_kernel_d/include/CGAL/RS/pagealloc.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/RS/polynomial_1.h b/Algebraic_kernel_d/include/CGAL/RS/polynomial_1.h index 5302b4044a3..82bb44997d8 100644 --- a/Algebraic_kernel_d/include/CGAL/RS/polynomial_1.h +++ b/Algebraic_kernel_d/include/CGAL/RS/polynomial_1.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/RS/polynomial_1_constructors.h b/Algebraic_kernel_d/include/CGAL/RS/polynomial_1_constructors.h index 2aafcd527ad..f0508166d3a 100644 --- a/Algebraic_kernel_d/include/CGAL/RS/polynomial_1_constructors.h +++ b/Algebraic_kernel_d/include/CGAL/RS/polynomial_1_constructors.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/RS/polynomial_1_eval.h b/Algebraic_kernel_d/include/CGAL/RS/polynomial_1_eval.h index 78cedbfaa16..be38c255335 100644 --- a/Algebraic_kernel_d/include/CGAL/RS/polynomial_1_eval.h +++ b/Algebraic_kernel_d/include/CGAL/RS/polynomial_1_eval.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/RS/polynomial_1_functors.h b/Algebraic_kernel_d/include/CGAL/RS/polynomial_1_functors.h index c45ede47c08..c17e3362fa5 100644 --- a/Algebraic_kernel_d/include/CGAL/RS/polynomial_1_functors.h +++ b/Algebraic_kernel_d/include/CGAL/RS/polynomial_1_functors.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/RS/polynomial_1_impl.h b/Algebraic_kernel_d/include/CGAL/RS/polynomial_1_impl.h index 570570b1796..03fddc29256 100644 --- a/Algebraic_kernel_d/include/CGAL/RS/polynomial_1_impl.h +++ b/Algebraic_kernel_d/include/CGAL/RS/polynomial_1_impl.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/RS/polynomial_1_io.h b/Algebraic_kernel_d/include/CGAL/RS/polynomial_1_io.h index 70b68ee8e83..baa659d6f40 100644 --- a/Algebraic_kernel_d/include/CGAL/RS/polynomial_1_io.h +++ b/Algebraic_kernel_d/include/CGAL/RS/polynomial_1_io.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/RS/polynomial_1_member.h b/Algebraic_kernel_d/include/CGAL/RS/polynomial_1_member.h index 9d4e3edb315..d21100975e6 100644 --- a/Algebraic_kernel_d/include/CGAL/RS/polynomial_1_member.h +++ b/Algebraic_kernel_d/include/CGAL/RS/polynomial_1_member.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/RS/polynomial_1_operators.h b/Algebraic_kernel_d/include/CGAL/RS/polynomial_1_operators.h index 8b755126278..ce9085a4afa 100644 --- a/Algebraic_kernel_d/include/CGAL/RS/polynomial_1_operators.h +++ b/Algebraic_kernel_d/include/CGAL/RS/polynomial_1_operators.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/RS/polynomial_1_parser.h b/Algebraic_kernel_d/include/CGAL/RS/polynomial_1_parser.h index a5175f96b19..7710d338d09 100644 --- a/Algebraic_kernel_d/include/CGAL/RS/polynomial_1_parser.h +++ b/Algebraic_kernel_d/include/CGAL/RS/polynomial_1_parser.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/RS/polynomial_1_utils.h b/Algebraic_kernel_d/include/CGAL/RS/polynomial_1_utils.h index 70470bb7c12..b5b24196bb6 100644 --- a/Algebraic_kernel_d/include/CGAL/RS/polynomial_1_utils.h +++ b/Algebraic_kernel_d/include/CGAL/RS/polynomial_1_utils.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/RS/polynomial_converter.h b/Algebraic_kernel_d/include/CGAL/RS/polynomial_converter.h index bf5e31cccf8..384f82a9aff 100644 --- a/Algebraic_kernel_d/include/CGAL/RS/polynomial_converter.h +++ b/Algebraic_kernel_d/include/CGAL/RS/polynomial_converter.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/RS/pp.h b/Algebraic_kernel_d/include/CGAL/RS/pp.h index 13eb9d9a692..7aa410553a1 100644 --- a/Algebraic_kernel_d/include/CGAL/RS/pp.h +++ b/Algebraic_kernel_d/include/CGAL/RS/pp.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/RS/primes.h b/Algebraic_kernel_d/include/CGAL/RS/primes.h index d020c3c50f4..d79b72f54fb 100644 --- a/Algebraic_kernel_d/include/CGAL/RS/primes.h +++ b/Algebraic_kernel_d/include/CGAL/RS/primes.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/RS/refine_1.h b/Algebraic_kernel_d/include/CGAL/RS/refine_1.h index e06c067aa68..8307b842c36 100644 --- a/Algebraic_kernel_d/include/CGAL/RS/refine_1.h +++ b/Algebraic_kernel_d/include/CGAL/RS/refine_1.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/RS/refine_1_rs.h b/Algebraic_kernel_d/include/CGAL/RS/refine_1_rs.h index 27838d5d5b5..7e7b2407f4d 100644 --- a/Algebraic_kernel_d/include/CGAL/RS/refine_1_rs.h +++ b/Algebraic_kernel_d/include/CGAL/RS/refine_1_rs.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/RS/rs_calls_1.h b/Algebraic_kernel_d/include/CGAL/RS/rs_calls_1.h index e15e3af55e9..c1893c81b4e 100644 --- a/Algebraic_kernel_d/include/CGAL/RS/rs_calls_1.h +++ b/Algebraic_kernel_d/include/CGAL/RS/rs_calls_1.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/RS/sign_1.h b/Algebraic_kernel_d/include/CGAL/RS/sign_1.h index bc1ced9d299..0da9eecf109 100644 --- a/Algebraic_kernel_d/include/CGAL/RS/sign_1.h +++ b/Algebraic_kernel_d/include/CGAL/RS/sign_1.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/RS/sign_1_no_rs.h b/Algebraic_kernel_d/include/CGAL/RS/sign_1_no_rs.h index b916abafdd1..124b4f8ad5f 100644 --- a/Algebraic_kernel_d/include/CGAL/RS/sign_1_no_rs.h +++ b/Algebraic_kernel_d/include/CGAL/RS/sign_1_no_rs.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/RS/sign_1_rs.h b/Algebraic_kernel_d/include/CGAL/RS/sign_1_rs.h index 85c24c378e2..2441e01e2b5 100644 --- a/Algebraic_kernel_d/include/CGAL/RS/sign_1_rs.h +++ b/Algebraic_kernel_d/include/CGAL/RS/sign_1_rs.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/RS/solve_1.h b/Algebraic_kernel_d/include/CGAL/RS/solve_1.h index 883298a6a5e..c70dc5bdbad 100644 --- a/Algebraic_kernel_d/include/CGAL/RS/solve_1.h +++ b/Algebraic_kernel_d/include/CGAL/RS/solve_1.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/include/CGAL/RS/ugcd.h b/Algebraic_kernel_d/include/CGAL/RS/ugcd.h index 61f670c3c1c..aff908b1e2f 100644 --- a/Algebraic_kernel_d/include/CGAL/RS/ugcd.h +++ b/Algebraic_kernel_d/include/CGAL/RS/ugcd.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/test/Algebraic_kernel_d/Algebraic_kernel_rs_gmpq_d_1.cpp b/Algebraic_kernel_d/test/Algebraic_kernel_d/Algebraic_kernel_rs_gmpq_d_1.cpp index a173eab4a20..dc59054762f 100644 --- a/Algebraic_kernel_d/test/Algebraic_kernel_d/Algebraic_kernel_rs_gmpq_d_1.cpp +++ b/Algebraic_kernel_d/test/Algebraic_kernel_d/Algebraic_kernel_rs_gmpq_d_1.cpp @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/test/Algebraic_kernel_d/Algebraic_kernel_rs_gmpz_d_1.cpp b/Algebraic_kernel_d/test/Algebraic_kernel_d/Algebraic_kernel_rs_gmpz_d_1.cpp index 574bd9bd5e5..41432ca1421 100644 --- a/Algebraic_kernel_d/test/Algebraic_kernel_d/Algebraic_kernel_rs_gmpz_d_1.cpp +++ b/Algebraic_kernel_d/test/Algebraic_kernel_d/Algebraic_kernel_rs_gmpz_d_1.cpp @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/test/Algebraic_kernel_d/Real_embeddable_traits_extension.cpp b/Algebraic_kernel_d/test/Algebraic_kernel_d/Real_embeddable_traits_extension.cpp index b3b1d2ac858..2fc59ef7533 100644 --- a/Algebraic_kernel_d/test/Algebraic_kernel_d/Real_embeddable_traits_extension.cpp +++ b/Algebraic_kernel_d/test/Algebraic_kernel_d/Real_embeddable_traits_extension.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_algebraic_curve_kernel_2.h b/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_algebraic_curve_kernel_2.h index 5f075d6dec5..1867b45f8aa 100644 --- a/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_algebraic_curve_kernel_2.h +++ b/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_algebraic_curve_kernel_2.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_algebraic_kernel_1.h b/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_algebraic_kernel_1.h index f6472fc433a..c160de5b144 100644 --- a/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_algebraic_kernel_1.h +++ b/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_algebraic_kernel_1.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_algebraic_kernel_2.h b/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_algebraic_kernel_2.h index 08fb2f85c56..d5bfea9f405 100644 --- a/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_algebraic_kernel_2.h +++ b/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_algebraic_kernel_2.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_bitstream_descartes.h b/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_bitstream_descartes.h index 628a85b88c3..0ebfca811fb 100644 --- a/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_bitstream_descartes.h +++ b/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_bitstream_descartes.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_real_comparable.h b/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_real_comparable.h index 7b1f23a5058..3eba07fca4c 100644 --- a/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_real_comparable.h +++ b/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_real_comparable.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_real_root_isolator.h b/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_real_root_isolator.h index d351ea9da22..865a0e4a953 100644 --- a/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_real_root_isolator.h +++ b/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_real_root_isolator.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Algebraic_kernel_d/test/Algebraic_kernel_d/rs_isolator.cpp b/Algebraic_kernel_d/test/Algebraic_kernel_d/rs_isolator.cpp index 85381148a97..10cf2e3c02e 100644 --- a/Algebraic_kernel_d/test/Algebraic_kernel_d/rs_isolator.cpp +++ b/Algebraic_kernel_d/test/Algebraic_kernel_d/rs_isolator.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Arithmetic_kernel/include/CGAL/Arithmetic_kernel.h b/Arithmetic_kernel/include/CGAL/Arithmetic_kernel.h index 6af47ab9599..b408f5220df 100644 --- a/Arithmetic_kernel/include/CGAL/Arithmetic_kernel.h +++ b/Arithmetic_kernel/include/CGAL/Arithmetic_kernel.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Arithmetic_kernel/include/CGAL/Arithmetic_kernel/Arithmetic_kernel_base.h b/Arithmetic_kernel/include/CGAL/Arithmetic_kernel/Arithmetic_kernel_base.h index a952f36a48d..c6b956726ba 100644 --- a/Arithmetic_kernel/include/CGAL/Arithmetic_kernel/Arithmetic_kernel_base.h +++ b/Arithmetic_kernel/include/CGAL/Arithmetic_kernel/Arithmetic_kernel_base.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Arithmetic_kernel/include/CGAL/CORE_arithmetic_kernel.h b/Arithmetic_kernel/include/CGAL/CORE_arithmetic_kernel.h index 8098129bbcf..05c9eaa8b50 100644 --- a/Arithmetic_kernel/include/CGAL/CORE_arithmetic_kernel.h +++ b/Arithmetic_kernel/include/CGAL/CORE_arithmetic_kernel.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Arithmetic_kernel/include/CGAL/GMP_arithmetic_kernel.h b/Arithmetic_kernel/include/CGAL/GMP_arithmetic_kernel.h index bc0f55af663..9f367d2927a 100644 --- a/Arithmetic_kernel/include/CGAL/GMP_arithmetic_kernel.h +++ b/Arithmetic_kernel/include/CGAL/GMP_arithmetic_kernel.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Arithmetic_kernel/include/CGAL/Get_arithmetic_kernel.h b/Arithmetic_kernel/include/CGAL/Get_arithmetic_kernel.h index 275a1c70d9a..8fc4838f6a8 100644 --- a/Arithmetic_kernel/include/CGAL/Get_arithmetic_kernel.h +++ b/Arithmetic_kernel/include/CGAL/Get_arithmetic_kernel.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Arithmetic_kernel/include/CGAL/LEDA_arithmetic_kernel.h b/Arithmetic_kernel/include/CGAL/LEDA_arithmetic_kernel.h index b041e819a3c..ed1573fb8f0 100644 --- a/Arithmetic_kernel/include/CGAL/LEDA_arithmetic_kernel.h +++ b/Arithmetic_kernel/include/CGAL/LEDA_arithmetic_kernel.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Arithmetic_kernel/include/CGAL/MP_Float_arithmetic_kernel.h b/Arithmetic_kernel/include/CGAL/MP_Float_arithmetic_kernel.h index 6190c9b6143..0e1df7ab01a 100644 --- a/Arithmetic_kernel/include/CGAL/MP_Float_arithmetic_kernel.h +++ b/Arithmetic_kernel/include/CGAL/MP_Float_arithmetic_kernel.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Arithmetic_kernel/test/Arithmetic_kernel/include/CGAL/Test/_test_arithmetic_kernel.h b/Arithmetic_kernel/test/Arithmetic_kernel/include/CGAL/Test/_test_arithmetic_kernel.h index 830ece6b737..a399a6972fa 100644 --- a/Arithmetic_kernel/test/Arithmetic_kernel/include/CGAL/Test/_test_arithmetic_kernel.h +++ b/Arithmetic_kernel/test/Arithmetic_kernel/include/CGAL/Test/_test_arithmetic_kernel.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_algebraic_segment_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_algebraic_segment_traits_2.h index 087d007d1b0..9f20b4495bb 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_algebraic_segment_traits_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_algebraic_segment_traits_2.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Arc_2.h b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Arc_2.h index 4a793cb0191..5c23fe56d47 100644 --- a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Arc_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Arc_2.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Curve_interval_arcno_cache.h b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Curve_interval_arcno_cache.h index ac3e72ec1dc..fa8c6834bb7 100644 --- a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Curve_interval_arcno_cache.h +++ b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Curve_interval_arcno_cache.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Curve_renderer_facade.h b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Curve_renderer_facade.h index fceff291f5b..f9df7dfec9f 100644 --- a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Curve_renderer_facade.h +++ b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Curve_renderer_facade.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Curved_kernel_via_analysis_2_functors.h b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Curved_kernel_via_analysis_2_functors.h index 1fe873c8e40..7bd8ef56691 100644 --- a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Curved_kernel_via_analysis_2_functors.h +++ b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Curved_kernel_via_analysis_2_functors.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Curved_kernel_via_analysis_2_impl.h b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Curved_kernel_via_analysis_2_impl.h index 9a26e0d6568..69499ba4be7 100644 --- a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Curved_kernel_via_analysis_2_impl.h +++ b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Curved_kernel_via_analysis_2_impl.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Filtered_curved_kernel_via_analysis_2_impl.h b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Filtered_curved_kernel_via_analysis_2_impl.h index 2890c5d8f1c..acfa5e1fa25 100644 --- a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Filtered_curved_kernel_via_analysis_2_impl.h +++ b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Filtered_curved_kernel_via_analysis_2_impl.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Generic_arc_2.h b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Generic_arc_2.h index ab9f430e0bf..46765905157 100644 --- a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Generic_arc_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Generic_arc_2.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Generic_point_2.h b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Generic_point_2.h index 1f2ef476770..02a4c99ccd0 100644 --- a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Generic_point_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Generic_point_2.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Make_x_monotone_2.h b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Make_x_monotone_2.h index 903f6fc2b6b..c834197a190 100644 --- a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Make_x_monotone_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Make_x_monotone_2.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Non_x_monotone_arc_2.h b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Non_x_monotone_arc_2.h index 214f8204083..b4d12ba1a88 100644 --- a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Non_x_monotone_arc_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Non_x_monotone_arc_2.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Point_2.h b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Point_2.h index c9c233d1354..66e323e4c76 100644 --- a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Point_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Point_2.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Qt_widget_Curve_renderer_2.h b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Qt_widget_Curve_renderer_2.h index 3c60a765471..8005c97d271 100644 --- a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Qt_widget_Curve_renderer_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Qt_widget_Curve_renderer_2.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Sweep_curves_adapter_2.h b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Sweep_curves_adapter_2.h index 713a4bb3581..514e5435b40 100644 --- a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Sweep_curves_adapter_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Sweep_curves_adapter_2.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/gfx/Curve_renderer_2.h b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/gfx/Curve_renderer_2.h index 5fe0af53df8..c94754436dc 100644 --- a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/gfx/Curve_renderer_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/gfx/Curve_renderer_2.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/gfx/Curve_renderer_internals.h b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/gfx/Curve_renderer_internals.h index aa3cde8fc8a..8c8bb474858 100644 --- a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/gfx/Curve_renderer_internals.h +++ b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/gfx/Curve_renderer_internals.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/gfx/Curve_renderer_traits.h b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/gfx/Curve_renderer_traits.h index 2503d229e9b..ed7caa63d25 100644 --- a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/gfx/Curve_renderer_traits.h +++ b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/gfx/Curve_renderer_traits.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/gfx/Subdivision_1.h b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/gfx/Subdivision_1.h index b9a2d7faf47..2c269dc7258 100644 --- a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/gfx/Subdivision_1.h +++ b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/gfx/Subdivision_1.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/gfx/Subdivision_2.h b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/gfx/Subdivision_2.h index d59e21a2da5..6194188ff0e 100644 --- a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/gfx/Subdivision_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/gfx/Subdivision_2.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/test/simple_models.h b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/test/simple_models.h index ea045ab9e1c..d2a6fbdbce0 100644 --- a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/test/simple_models.h +++ b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/test/simple_models.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/BGL/include/CGAL/HalfedgeDS_face_max_base_with_id.h b/BGL/include/CGAL/HalfedgeDS_face_max_base_with_id.h index 1ab4deba3bd..acf1368a8da 100644 --- a/BGL/include/CGAL/HalfedgeDS_face_max_base_with_id.h +++ b/BGL/include/CGAL/HalfedgeDS_face_max_base_with_id.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/BGL/include/CGAL/HalfedgeDS_halfedge_max_base_with_id.h b/BGL/include/CGAL/HalfedgeDS_halfedge_max_base_with_id.h index 243eaf31471..6b33dff2130 100644 --- a/BGL/include/CGAL/HalfedgeDS_halfedge_max_base_with_id.h +++ b/BGL/include/CGAL/HalfedgeDS_halfedge_max_base_with_id.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/BGL/include/CGAL/HalfedgeDS_vertex_max_base_with_id.h b/BGL/include/CGAL/HalfedgeDS_vertex_max_base_with_id.h index 86e0bac8f5f..657bebb1e3d 100644 --- a/BGL/include/CGAL/HalfedgeDS_vertex_max_base_with_id.h +++ b/BGL/include/CGAL/HalfedgeDS_vertex_max_base_with_id.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/BGL/include/CGAL/Polyhedron_items_with_id_3.h b/BGL/include/CGAL/Polyhedron_items_with_id_3.h index 46e44a1b77c..d99deb2a971 100644 --- a/BGL/include/CGAL/Polyhedron_items_with_id_3.h +++ b/BGL/include/CGAL/Polyhedron_items_with_id_3.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/BGL/include/CGAL/Triangulation_vertex_base_with_id_2.h b/BGL/include/CGAL/Triangulation_vertex_base_with_id_2.h index dca6f4edee9..f3a861dad64 100644 --- a/BGL/include/CGAL/Triangulation_vertex_base_with_id_2.h +++ b/BGL/include/CGAL/Triangulation_vertex_base_with_id_2.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/BGL/include/CGAL/boost/graph/graph_traits_Delaunay_triangulation_2.h b/BGL/include/CGAL/boost/graph/graph_traits_Delaunay_triangulation_2.h index 8c8831bd8bc..4fd8a41f53e 100644 --- a/BGL/include/CGAL/boost/graph/graph_traits_Delaunay_triangulation_2.h +++ b/BGL/include/CGAL/boost/graph/graph_traits_Delaunay_triangulation_2.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/BGL/include/CGAL/boost/graph/graph_traits_HalfedgeDS.h b/BGL/include/CGAL/boost/graph/graph_traits_HalfedgeDS.h index c9e326e4d65..7689590e2e1 100644 --- a/BGL/include/CGAL/boost/graph/graph_traits_HalfedgeDS.h +++ b/BGL/include/CGAL/boost/graph/graph_traits_HalfedgeDS.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/BGL/include/CGAL/boost/graph/graph_traits_Polyhedron_3.h b/BGL/include/CGAL/boost/graph/graph_traits_Polyhedron_3.h index 048078f5dd1..3bae9465832 100644 --- a/BGL/include/CGAL/boost/graph/graph_traits_Polyhedron_3.h +++ b/BGL/include/CGAL/boost/graph/graph_traits_Polyhedron_3.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/BGL/include/CGAL/boost/graph/graph_traits_Triangulation_2.h b/BGL/include/CGAL/boost/graph/graph_traits_Triangulation_2.h index bcc8a94674c..9443772bb43 100644 --- a/BGL/include/CGAL/boost/graph/graph_traits_Triangulation_2.h +++ b/BGL/include/CGAL/boost/graph/graph_traits_Triangulation_2.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/BGL/include/CGAL/boost/graph/halfedge_graph_traits.h b/BGL/include/CGAL/boost/graph/halfedge_graph_traits.h index 9829a7a1123..8a3648ca8d3 100644 --- a/BGL/include/CGAL/boost/graph/halfedge_graph_traits.h +++ b/BGL/include/CGAL/boost/graph/halfedge_graph_traits.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/BGL/include/CGAL/boost/graph/halfedge_graph_traits_HalfedgeDS.h b/BGL/include/CGAL/boost/graph/halfedge_graph_traits_HalfedgeDS.h index bbb8cc3f3c1..039b446e8fa 100644 --- a/BGL/include/CGAL/boost/graph/halfedge_graph_traits_HalfedgeDS.h +++ b/BGL/include/CGAL/boost/graph/halfedge_graph_traits_HalfedgeDS.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/BGL/include/CGAL/boost/graph/halfedge_graph_traits_Polyhedron_3.h b/BGL/include/CGAL/boost/graph/halfedge_graph_traits_Polyhedron_3.h index 3f6f52c8b66..d03eaa8d53b 100644 --- a/BGL/include/CGAL/boost/graph/halfedge_graph_traits_Polyhedron_3.h +++ b/BGL/include/CGAL/boost/graph/halfedge_graph_traits_Polyhedron_3.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/BGL/include/CGAL/boost/graph/named_function_params.h b/BGL/include/CGAL/boost/graph/named_function_params.h index f192cdb939f..f1baca36367 100644 --- a/BGL/include/CGAL/boost/graph/named_function_params.h +++ b/BGL/include/CGAL/boost/graph/named_function_params.h @@ -27,8 +27,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/BGL/include/CGAL/boost/graph/properties.h b/BGL/include/CGAL/boost/graph/properties.h index 1d4667d7de8..a436271a3ab 100644 --- a/BGL/include/CGAL/boost/graph/properties.h +++ b/BGL/include/CGAL/boost/graph/properties.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/BGL/include/CGAL/boost/graph/properties_Polyhedron_3.h b/BGL/include/CGAL/boost/graph/properties_Polyhedron_3.h index 3486b1919bb..03b4540e0dd 100644 --- a/BGL/include/CGAL/boost/graph/properties_Polyhedron_3.h +++ b/BGL/include/CGAL/boost/graph/properties_Polyhedron_3.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGAL_ipelets/demo/CGAL_ipelets/alpha_shapes.cpp b/CGAL_ipelets/demo/CGAL_ipelets/alpha_shapes.cpp index 4808f06989c..102ba1ded0d 100644 --- a/CGAL_ipelets/demo/CGAL_ipelets/alpha_shapes.cpp +++ b/CGAL_ipelets/demo/CGAL_ipelets/alpha_shapes.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGAL_ipelets/demo/CGAL_ipelets/arrangement.cpp b/CGAL_ipelets/demo/CGAL_ipelets/arrangement.cpp index 68467cabe8f..9ec8d5734e9 100644 --- a/CGAL_ipelets/demo/CGAL_ipelets/arrangement.cpp +++ b/CGAL_ipelets/demo/CGAL_ipelets/arrangement.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGAL_ipelets/demo/CGAL_ipelets/bbox_restriction.cpp b/CGAL_ipelets/demo/CGAL_ipelets/bbox_restriction.cpp index ea5b512f898..302e5431670 100644 --- a/CGAL_ipelets/demo/CGAL_ipelets/bbox_restriction.cpp +++ b/CGAL_ipelets/demo/CGAL_ipelets/bbox_restriction.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGAL_ipelets/demo/CGAL_ipelets/diagrams.cpp b/CGAL_ipelets/demo/CGAL_ipelets/diagrams.cpp index 80502ddad7c..c49c5d5b27f 100644 --- a/CGAL_ipelets/demo/CGAL_ipelets/diagrams.cpp +++ b/CGAL_ipelets/demo/CGAL_ipelets/diagrams.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGAL_ipelets/demo/CGAL_ipelets/generator.cpp b/CGAL_ipelets/demo/CGAL_ipelets/generator.cpp index 93def51c62c..4d1b2d89013 100644 --- a/CGAL_ipelets/demo/CGAL_ipelets/generator.cpp +++ b/CGAL_ipelets/demo/CGAL_ipelets/generator.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGAL_ipelets/demo/CGAL_ipelets/hilbert_sort.cpp b/CGAL_ipelets/demo/CGAL_ipelets/hilbert_sort.cpp index acc123b1c01..a22760be8d8 100644 --- a/CGAL_ipelets/demo/CGAL_ipelets/hilbert_sort.cpp +++ b/CGAL_ipelets/demo/CGAL_ipelets/hilbert_sort.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGAL_ipelets/demo/CGAL_ipelets/hull.cpp b/CGAL_ipelets/demo/CGAL_ipelets/hull.cpp index affe5a00525..5e4b0948af5 100644 --- a/CGAL_ipelets/demo/CGAL_ipelets/hull.cpp +++ b/CGAL_ipelets/demo/CGAL_ipelets/hull.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGAL_ipelets/demo/CGAL_ipelets/include/CGAL_ipelets/k_delaunay.h b/CGAL_ipelets/demo/CGAL_ipelets/include/CGAL_ipelets/k_delaunay.h index a73489fbf62..6bcaf045b95 100644 --- a/CGAL_ipelets/demo/CGAL_ipelets/include/CGAL_ipelets/k_delaunay.h +++ b/CGAL_ipelets/demo/CGAL_ipelets/include/CGAL_ipelets/k_delaunay.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGAL_ipelets/demo/CGAL_ipelets/mesh_2.cpp b/CGAL_ipelets/demo/CGAL_ipelets/mesh_2.cpp index 2af755f7cc3..3de45eff734 100644 --- a/CGAL_ipelets/demo/CGAL_ipelets/mesh_2.cpp +++ b/CGAL_ipelets/demo/CGAL_ipelets/mesh_2.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGAL_ipelets/demo/CGAL_ipelets/minkowski.cpp b/CGAL_ipelets/demo/CGAL_ipelets/minkowski.cpp index 7f1c40ec153..ba1fe47735a 100644 --- a/CGAL_ipelets/demo/CGAL_ipelets/minkowski.cpp +++ b/CGAL_ipelets/demo/CGAL_ipelets/minkowski.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGAL_ipelets/demo/CGAL_ipelets/multi_delaunay.cpp b/CGAL_ipelets/demo/CGAL_ipelets/multi_delaunay.cpp index add9320145d..1d5d717a42f 100644 --- a/CGAL_ipelets/demo/CGAL_ipelets/multi_delaunay.cpp +++ b/CGAL_ipelets/demo/CGAL_ipelets/multi_delaunay.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGAL_ipelets/demo/CGAL_ipelets/multi_regular.cpp b/CGAL_ipelets/demo/CGAL_ipelets/multi_regular.cpp index ccfa4ea2cbe..c161df4c5a8 100644 --- a/CGAL_ipelets/demo/CGAL_ipelets/multi_regular.cpp +++ b/CGAL_ipelets/demo/CGAL_ipelets/multi_regular.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGAL_ipelets/demo/CGAL_ipelets/partition.cpp b/CGAL_ipelets/demo/CGAL_ipelets/partition.cpp index 8895e626d1a..91dfe327d8b 100644 --- a/CGAL_ipelets/demo/CGAL_ipelets/partition.cpp +++ b/CGAL_ipelets/demo/CGAL_ipelets/partition.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGAL_ipelets/demo/CGAL_ipelets/pca.cpp b/CGAL_ipelets/demo/CGAL_ipelets/pca.cpp index cef34e1d3c2..62f74a5b12c 100644 --- a/CGAL_ipelets/demo/CGAL_ipelets/pca.cpp +++ b/CGAL_ipelets/demo/CGAL_ipelets/pca.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGAL_ipelets/demo/CGAL_ipelets/skeleton.cpp b/CGAL_ipelets/demo/CGAL_ipelets/skeleton.cpp index a642a14f225..570a0ccb570 100644 --- a/CGAL_ipelets/demo/CGAL_ipelets/skeleton.cpp +++ b/CGAL_ipelets/demo/CGAL_ipelets/skeleton.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGAL_ipelets/demo/CGAL_ipelets/triangulation.cpp b/CGAL_ipelets/demo/CGAL_ipelets/triangulation.cpp index 7158578633e..61a1e8770b9 100644 --- a/CGAL_ipelets/demo/CGAL_ipelets/triangulation.cpp +++ b/CGAL_ipelets/demo/CGAL_ipelets/triangulation.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGAL_ipelets/include/CGAL/CGAL_Ipelet_base.h b/CGAL_ipelets/include/CGAL/CGAL_Ipelet_base.h index 02d34fe6216..7a922c55ed6 100644 --- a/CGAL_ipelets/include/CGAL/CGAL_Ipelet_base.h +++ b/CGAL_ipelets/include/CGAL/CGAL_Ipelet_base.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGAL_ipelets/include/CGAL/CGAL_Ipelet_base_v6.h b/CGAL_ipelets/include/CGAL/CGAL_Ipelet_base_v6.h index 5cf91642fff..a6768ade4f2 100644 --- a/CGAL_ipelets/include/CGAL/CGAL_Ipelet_base_v6.h +++ b/CGAL_ipelets/include/CGAL/CGAL_Ipelet_base_v6.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGAL_ipelets/include/CGAL/CGAL_Ipelet_base_v7.h b/CGAL_ipelets/include/CGAL/CGAL_Ipelet_base_v7.h index 49864497d79..ead80f0f5d8 100644 --- a/CGAL_ipelets/include/CGAL/CGAL_Ipelet_base_v7.h +++ b/CGAL_ipelets/include/CGAL/CGAL_Ipelet_base_v7.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGAL_ipelets/include/CGAL/grabbers.h b/CGAL_ipelets/include/CGAL/grabbers.h index 277125ab0ed..43d1bfd24dd 100644 --- a/CGAL_ipelets/include/CGAL/grabbers.h +++ b/CGAL_ipelets/include/CGAL/grabbers.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Cartesian_kernel/include/CGAL/Cartesian.h b/Cartesian_kernel/include/CGAL/Cartesian.h index 2f777fff961..4b9e6b6b745 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian.h +++ b/Cartesian_kernel/include/CGAL/Cartesian.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Aff_transformation_2.h b/Cartesian_kernel/include/CGAL/Cartesian/Aff_transformation_2.h index 5555e001353..77f0ec9fdf7 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Aff_transformation_2.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Aff_transformation_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Aff_transformation_3.h b/Cartesian_kernel/include/CGAL/Cartesian/Aff_transformation_3.h index 378fa0681a4..754a79d12be 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Aff_transformation_3.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Aff_transformation_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Aff_transformation_rep_2.h b/Cartesian_kernel/include/CGAL/Cartesian/Aff_transformation_rep_2.h index 6ba5dccbe20..d5a25f176b7 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Aff_transformation_rep_2.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Aff_transformation_rep_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Aff_transformation_rep_3.h b/Cartesian_kernel/include/CGAL/Cartesian/Aff_transformation_rep_3.h index 57e7cfd8381..a759fd70241 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Aff_transformation_rep_3.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Aff_transformation_rep_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Cartesian_base.h b/Cartesian_kernel/include/CGAL/Cartesian/Cartesian_base.h index 07e683619e1..335d7581ff6 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Cartesian_base.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Cartesian_base.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Circle_2.h b/Cartesian_kernel/include/CGAL/Cartesian/Circle_2.h index 8ef2e4a6119..3b0c9f731bc 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Circle_2.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Circle_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Circle_3.h b/Cartesian_kernel/include/CGAL/Cartesian/Circle_3.h index 6eefb666ae7..5eed58713c5 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Circle_3.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Circle_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Data_accessor_2.h b/Cartesian_kernel/include/CGAL/Cartesian/Data_accessor_2.h index 2690483b67b..3d3362d78b3 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Data_accessor_2.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Data_accessor_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Direction_2.h b/Cartesian_kernel/include/CGAL/Cartesian/Direction_2.h index 1230fefce8f..828753a846b 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Direction_2.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Direction_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Direction_3.h b/Cartesian_kernel/include/CGAL/Cartesian/Direction_3.h index 464a4863cde..cf8833df875 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Direction_3.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Direction_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Iso_cuboid_3.h b/Cartesian_kernel/include/CGAL/Cartesian/Iso_cuboid_3.h index fa0e209daa3..6f9dd2e0c0d 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Iso_cuboid_3.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Iso_cuboid_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Iso_rectangle_2.h b/Cartesian_kernel/include/CGAL/Cartesian/Iso_rectangle_2.h index 11257265122..638fcb95879 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Iso_rectangle_2.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Iso_rectangle_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Line_2.h b/Cartesian_kernel/include/CGAL/Cartesian/Line_2.h index 349cad04df4..7fb49c1e9f7 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Line_2.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Line_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Line_3.h b/Cartesian_kernel/include/CGAL/Cartesian/Line_3.h index 15273826ee9..79acd831706 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Line_3.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Line_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Plane_3.h b/Cartesian_kernel/include/CGAL/Cartesian/Plane_3.h index ec4ebfff3fd..ff732f012e7 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Plane_3.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Plane_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Point_2.h b/Cartesian_kernel/include/CGAL/Cartesian/Point_2.h index dd5e75a165e..9d5029274a7 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Point_2.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Point_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Point_3.h b/Cartesian_kernel/include/CGAL/Cartesian/Point_3.h index aa415e8346e..364f1bbf91a 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Point_3.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Point_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Ray_2.h b/Cartesian_kernel/include/CGAL/Cartesian/Ray_2.h index e49d295111f..c17fb96c187 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Ray_2.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Ray_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Ray_3.h b/Cartesian_kernel/include/CGAL/Cartesian/Ray_3.h index bb52e5a8202..47acd5d4589 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Ray_3.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Ray_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Rotation_rep_2.h b/Cartesian_kernel/include/CGAL/Cartesian/Rotation_rep_2.h index 6b53c342051..a18cce53ffc 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Rotation_rep_2.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Rotation_rep_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Scaling_rep_2.h b/Cartesian_kernel/include/CGAL/Cartesian/Scaling_rep_2.h index f3fd4aedf1e..a531fb0ba39 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Scaling_rep_2.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Scaling_rep_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Scaling_rep_3.h b/Cartesian_kernel/include/CGAL/Cartesian/Scaling_rep_3.h index 2455b6c465c..8d955e17fa2 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Scaling_rep_3.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Scaling_rep_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Segment_2.h b/Cartesian_kernel/include/CGAL/Cartesian/Segment_2.h index 427e8086ad1..41280d81aef 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Segment_2.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Segment_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Segment_3.h b/Cartesian_kernel/include/CGAL/Cartesian/Segment_3.h index d4bd4cfe43c..145b1289e45 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Segment_3.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Segment_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Sphere_3.h b/Cartesian_kernel/include/CGAL/Cartesian/Sphere_3.h index 4751027cd45..698b3b87763 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Sphere_3.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Sphere_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Tetrahedron_3.h b/Cartesian_kernel/include/CGAL/Cartesian/Tetrahedron_3.h index 1488f458c1a..c5e17c7b3a0 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Tetrahedron_3.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Tetrahedron_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Translation_rep_2.h b/Cartesian_kernel/include/CGAL/Cartesian/Translation_rep_2.h index 8bc7aa12ef5..05f13266216 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Translation_rep_2.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Translation_rep_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Translation_rep_3.h b/Cartesian_kernel/include/CGAL/Cartesian/Translation_rep_3.h index 8b9e3c31008..504c1d454b5 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Translation_rep_3.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Translation_rep_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Triangle_2.h b/Cartesian_kernel/include/CGAL/Cartesian/Triangle_2.h index 6713b6bd6b6..ed664e1f7a2 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Triangle_2.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Triangle_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Triangle_3.h b/Cartesian_kernel/include/CGAL/Cartesian/Triangle_3.h index 7b26ac9a348..583d86d849f 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Triangle_3.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Triangle_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Vector_2.h b/Cartesian_kernel/include/CGAL/Cartesian/Vector_2.h index ba9af055ff8..2929a37b4b3 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Vector_2.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Vector_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Vector_3.h b/Cartesian_kernel/include/CGAL/Cartesian/Vector_3.h index f460b8cfc3a..50cc3409073 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Vector_3.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Vector_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Cartesian_kernel/include/CGAL/Cartesian/basic_constructions_2.h b/Cartesian_kernel/include/CGAL/Cartesian/basic_constructions_2.h index 658becfa25e..ca9ff1002ea 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/basic_constructions_2.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/basic_constructions_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Cartesian_kernel/include/CGAL/Cartesian/basic_constructions_3.h b/Cartesian_kernel/include/CGAL/Cartesian/basic_constructions_3.h index ea7398e933b..2f2ad03d39f 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/basic_constructions_3.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/basic_constructions_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Cartesian_kernel/include/CGAL/Cartesian/ft_constructions_2.h b/Cartesian_kernel/include/CGAL/Cartesian/ft_constructions_2.h index 80e8c0c7ff6..4adb9e681ad 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/ft_constructions_2.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/ft_constructions_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Cartesian_kernel/include/CGAL/Cartesian/ft_constructions_3.h b/Cartesian_kernel/include/CGAL/Cartesian/ft_constructions_3.h index e171ebb4e0e..08cef4a2802 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/ft_constructions_3.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/ft_constructions_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Cartesian_kernel/include/CGAL/Cartesian/function_objects.h b/Cartesian_kernel/include/CGAL/Cartesian/function_objects.h index 18180330912..7f3e1f30e60 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/function_objects.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/function_objects.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Cartesian_kernel/include/CGAL/Cartesian/line_constructions_2.h b/Cartesian_kernel/include/CGAL/Cartesian/line_constructions_2.h index 9d3d2aab450..3b3a3451fd7 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/line_constructions_2.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/line_constructions_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Cartesian_kernel/include/CGAL/Cartesian/plane_constructions_3.h b/Cartesian_kernel/include/CGAL/Cartesian/plane_constructions_3.h index 3ba2034b564..cc52e723044 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/plane_constructions_3.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/plane_constructions_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Cartesian_kernel/include/CGAL/Cartesian/point_constructions_2.h b/Cartesian_kernel/include/CGAL/Cartesian/point_constructions_2.h index 7ce9eb8f33c..295c206f23a 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/point_constructions_2.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/point_constructions_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Cartesian_kernel/include/CGAL/Cartesian/point_constructions_3.h b/Cartesian_kernel/include/CGAL/Cartesian/point_constructions_3.h index 22f748297ad..af42fb9fdc8 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/point_constructions_3.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/point_constructions_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Cartesian_kernel/include/CGAL/Cartesian/predicates_on_directions_2.h b/Cartesian_kernel/include/CGAL/Cartesian/predicates_on_directions_2.h index 8d547927f3f..2e3100cc4e6 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/predicates_on_directions_2.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/predicates_on_directions_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Cartesian_kernel/include/CGAL/Cartesian/predicates_on_planes_3.h b/Cartesian_kernel/include/CGAL/Cartesian/predicates_on_planes_3.h index 938f0f829a2..e9c00ceaeea 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/predicates_on_planes_3.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/predicates_on_planes_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Cartesian_kernel/include/CGAL/Cartesian/predicates_on_points_2.h b/Cartesian_kernel/include/CGAL/Cartesian/predicates_on_points_2.h index b3f7cd18d55..b8a57855b00 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/predicates_on_points_2.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/predicates_on_points_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Cartesian_kernel/include/CGAL/Cartesian/predicates_on_points_3.h b/Cartesian_kernel/include/CGAL/Cartesian/predicates_on_points_3.h index 91f855dc705..a56f561753d 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/predicates_on_points_3.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/predicates_on_points_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Cartesian_kernel/include/CGAL/Cartesian/solve_3.h b/Cartesian_kernel/include/CGAL/Cartesian/solve_3.h index e4df4c681b5..d5c4955392a 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/solve_3.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/solve_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Cartesian_kernel/include/CGAL/Cartesian_converter.h b/Cartesian_kernel/include/CGAL/Cartesian_converter.h index a077cd5de5c..14ab03e7273 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian_converter.h +++ b/Cartesian_kernel/include/CGAL/Cartesian_converter.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Cartesian_kernel/include/CGAL/Simple_cartesian.h b/Cartesian_kernel/include/CGAL/Simple_cartesian.h index 8f84d30dd2e..683699c6a10 100644 --- a/Cartesian_kernel/include/CGAL/Simple_cartesian.h +++ b/Cartesian_kernel/include/CGAL/Simple_cartesian.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Cartesian_kernel/include/CGAL/constructions/kernel_ftC2.h b/Cartesian_kernel/include/CGAL/constructions/kernel_ftC2.h index 967a394a2ad..ab3238f2710 100644 --- a/Cartesian_kernel/include/CGAL/constructions/kernel_ftC2.h +++ b/Cartesian_kernel/include/CGAL/constructions/kernel_ftC2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Cartesian_kernel/include/CGAL/constructions/kernel_ftC3.h b/Cartesian_kernel/include/CGAL/constructions/kernel_ftC3.h index 5ec4a96f378..f1d2af1c552 100644 --- a/Cartesian_kernel/include/CGAL/constructions/kernel_ftC3.h +++ b/Cartesian_kernel/include/CGAL/constructions/kernel_ftC3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Cartesian_kernel/include/CGAL/predicates/kernel_ftC2.h b/Cartesian_kernel/include/CGAL/predicates/kernel_ftC2.h index 8685593ff3a..4600cd898b7 100644 --- a/Cartesian_kernel/include/CGAL/predicates/kernel_ftC2.h +++ b/Cartesian_kernel/include/CGAL/predicates/kernel_ftC2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Cartesian_kernel/include/CGAL/predicates/kernel_ftC3.h b/Cartesian_kernel/include/CGAL/predicates/kernel_ftC3.h index e892b0832f3..bf77f6444d4 100644 --- a/Cartesian_kernel/include/CGAL/predicates/kernel_ftC3.h +++ b/Cartesian_kernel/include/CGAL/predicates/kernel_ftC3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Circular_kernel_2/benchmark/parser/benchmark_lexer.cpp b/Circular_kernel_2/benchmark/parser/benchmark_lexer.cpp index 058acfd1b24..5f95e276b3f 100644 --- a/Circular_kernel_2/benchmark/parser/benchmark_lexer.cpp +++ b/Circular_kernel_2/benchmark/parser/benchmark_lexer.cpp @@ -549,8 +549,8 @@ char *yytext; // // This file is part of BenchmarkParser; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with BenchmarkParser. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Circular_kernel_2/benchmark/parser/benchmark_lexer.l b/Circular_kernel_2/benchmark/parser/benchmark_lexer.l index ec7dc3fece2..4a09595cad4 100644 --- a/Circular_kernel_2/benchmark/parser/benchmark_lexer.l +++ b/Circular_kernel_2/benchmark/parser/benchmark_lexer.l @@ -4,8 +4,8 @@ // // This file is part of BenchmarkParser; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with BenchmarkParser. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Circular_kernel_2/benchmark/parser/benchmark_parser.h b/Circular_kernel_2/benchmark/parser/benchmark_parser.h index 2f8c3a9f544..27e55ff8aee 100644 --- a/Circular_kernel_2/benchmark/parser/benchmark_parser.h +++ b/Circular_kernel_2/benchmark/parser/benchmark_parser.h @@ -4,8 +4,8 @@ // // This file is part of BenchmarkParser; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with BenchmarkParser. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Circular_kernel_2/benchmark/parser/benchmark_parser.y b/Circular_kernel_2/benchmark/parser/benchmark_parser.y index 2fee14e4447..0cf21eba5da 100644 --- a/Circular_kernel_2/benchmark/parser/benchmark_parser.y +++ b/Circular_kernel_2/benchmark/parser/benchmark_parser.y @@ -4,8 +4,8 @@ // // This file is part of BenchmarkParser; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with BenchmarkParser. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Circular_kernel_2/benchmark/parser/benchmark_visitor.cpp b/Circular_kernel_2/benchmark/parser/benchmark_visitor.cpp index eaf893fd19b..cbb04c48a2a 100644 --- a/Circular_kernel_2/benchmark/parser/benchmark_visitor.cpp +++ b/Circular_kernel_2/benchmark/parser/benchmark_visitor.cpp @@ -4,8 +4,8 @@ // // This file is part of BenchmarkParser; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with BenchmarkParser. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Circular_kernel_2/benchmark/parser/benchmark_visitor.h b/Circular_kernel_2/benchmark/parser/benchmark_visitor.h index fd840e8168d..9ff6d6637b7 100644 --- a/Circular_kernel_2/benchmark/parser/benchmark_visitor.h +++ b/Circular_kernel_2/benchmark/parser/benchmark_visitor.h @@ -4,8 +4,8 @@ // // This file is part of BenchmarkParser; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with BenchmarkParser. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Circular_kernel_2/test/Circular_kernel_2/test_Circular_kernel_basic.cpp b/Circular_kernel_2/test/Circular_kernel_2/test_Circular_kernel_basic.cpp index d11232d5be9..36444054258 100644 --- a/Circular_kernel_2/test/Circular_kernel_2/test_Circular_kernel_basic.cpp +++ b/Circular_kernel_2/test/Circular_kernel_2/test_Circular_kernel_basic.cpp @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Circular_kernel_2/test/Circular_kernel_2/test_Exact_circular_kernel_basic.cpp b/Circular_kernel_2/test/Circular_kernel_2/test_Exact_circular_kernel_basic.cpp index a61200bdf31..65657ad3e00 100644 --- a/Circular_kernel_2/test/Circular_kernel_2/test_Exact_circular_kernel_basic.cpp +++ b/Circular_kernel_2/test/Circular_kernel_2/test_Exact_circular_kernel_basic.cpp @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Circular_kernel_3/include/CGAL/Spherical_kernel_type_equality_wrapper.h b/Circular_kernel_3/include/CGAL/Spherical_kernel_type_equality_wrapper.h index bf6de766ccf..62709d8c571 100644 --- a/Circular_kernel_3/include/CGAL/Spherical_kernel_type_equality_wrapper.h +++ b/Circular_kernel_3/include/CGAL/Spherical_kernel_type_equality_wrapper.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Circular_kernel_3/test/Circular_kernel_3/test_Lazy_spherical_kernel_basics.cpp b/Circular_kernel_3/test/Circular_kernel_3/test_Lazy_spherical_kernel_basics.cpp index 567adfafbb9..05cdca5cd94 100644 --- a/Circular_kernel_3/test/Circular_kernel_3/test_Lazy_spherical_kernel_basics.cpp +++ b/Circular_kernel_3/test/Circular_kernel_3/test_Lazy_spherical_kernel_basics.cpp @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Circular_kernel_3/test/Circular_kernel_3/test_Spherical_kernel_basics.cpp b/Circular_kernel_3/test/Circular_kernel_3/test_Spherical_kernel_basics.cpp index cf8ab557fa9..5c3c02c7e93 100644 --- a/Circular_kernel_3/test/Circular_kernel_3/test_Spherical_kernel_basics.cpp +++ b/Circular_kernel_3/test/Circular_kernel_3/test_Spherical_kernel_basics.cpp @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Circulator/include/CGAL/Safe_circulator_from_iterator.h b/Circulator/include/CGAL/Safe_circulator_from_iterator.h index 037b9209a3e..377eb021cb5 100644 --- a/Circulator/include/CGAL/Safe_circulator_from_iterator.h +++ b/Circulator/include/CGAL/Safe_circulator_from_iterator.h @@ -8,8 +8,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Circulator/include/CGAL/circulator.h b/Circulator/include/CGAL/circulator.h index f3c76160d00..6875ef8989b 100644 --- a/Circulator/include/CGAL/circulator.h +++ b/Circulator/include/CGAL/circulator.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Circulator/include/CGAL/circulator_bases.h b/Circulator/include/CGAL/circulator_bases.h index a59d804cad4..295a3591d4e 100644 --- a/Circulator/include/CGAL/circulator_bases.h +++ b/Circulator/include/CGAL/circulator_bases.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Circulator/include/CGAL/circulator_impl.h b/Circulator/include/CGAL/circulator_impl.h index 9c4f93619ce..bb7c08b40e7 100644 --- a/Circulator/include/CGAL/circulator_impl.h +++ b/Circulator/include/CGAL/circulator_impl.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Combinatorial_map/include/CGAL/Cell_attribute.h b/Combinatorial_map/include/CGAL/Cell_attribute.h index c40bbc46d0f..fb688ead6eb 100644 --- a/Combinatorial_map/include/CGAL/Cell_attribute.h +++ b/Combinatorial_map/include/CGAL/Cell_attribute.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Combinatorial_map/include/CGAL/Cell_const_iterators.h b/Combinatorial_map/include/CGAL/Cell_const_iterators.h index f958e5cb71b..d21a5824c50 100644 --- a/Combinatorial_map/include/CGAL/Cell_const_iterators.h +++ b/Combinatorial_map/include/CGAL/Cell_const_iterators.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Combinatorial_map/include/CGAL/Cell_iterators.h b/Combinatorial_map/include/CGAL/Cell_iterators.h index 78246546d4c..376268a52fe 100644 --- a/Combinatorial_map/include/CGAL/Cell_iterators.h +++ b/Combinatorial_map/include/CGAL/Cell_iterators.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Combinatorial_map/include/CGAL/Combinatorial_map.h b/Combinatorial_map/include/CGAL/Combinatorial_map.h index 9e5c0f868dd..ee296f30910 100644 --- a/Combinatorial_map/include/CGAL/Combinatorial_map.h +++ b/Combinatorial_map/include/CGAL/Combinatorial_map.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Combinatorial_map/include/CGAL/Combinatorial_map_basic_operations.h b/Combinatorial_map/include/CGAL/Combinatorial_map_basic_operations.h index e6c06b7d696..5a5e7f36d03 100644 --- a/Combinatorial_map/include/CGAL/Combinatorial_map_basic_operations.h +++ b/Combinatorial_map/include/CGAL/Combinatorial_map_basic_operations.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Combinatorial_map/include/CGAL/Combinatorial_map_constructors.h b/Combinatorial_map/include/CGAL/Combinatorial_map_constructors.h index c21ff9229fe..b7357001172 100644 --- a/Combinatorial_map/include/CGAL/Combinatorial_map_constructors.h +++ b/Combinatorial_map/include/CGAL/Combinatorial_map_constructors.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Combinatorial_map/include/CGAL/Combinatorial_map_min_items.h b/Combinatorial_map/include/CGAL/Combinatorial_map_min_items.h index 11a305a8f56..a782e6511d1 100644 --- a/Combinatorial_map/include/CGAL/Combinatorial_map_min_items.h +++ b/Combinatorial_map/include/CGAL/Combinatorial_map_min_items.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Combinatorial_map/include/CGAL/Combinatorial_map_operations.h b/Combinatorial_map/include/CGAL/Combinatorial_map_operations.h index 75185a1ae7f..96aa9cbfe03 100644 --- a/Combinatorial_map/include/CGAL/Combinatorial_map_operations.h +++ b/Combinatorial_map/include/CGAL/Combinatorial_map_operations.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Combinatorial_map/include/CGAL/Dart.h b/Combinatorial_map/include/CGAL/Dart.h index 3db4780d4fd..378ba7ad1a3 100644 --- a/Combinatorial_map/include/CGAL/Dart.h +++ b/Combinatorial_map/include/CGAL/Dart.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Combinatorial_map/include/CGAL/Dart_const_iterators.h b/Combinatorial_map/include/CGAL/Dart_const_iterators.h index 37e5d4f66a7..dde0800692b 100644 --- a/Combinatorial_map/include/CGAL/Dart_const_iterators.h +++ b/Combinatorial_map/include/CGAL/Dart_const_iterators.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Combinatorial_map/include/CGAL/Dart_iterators.h b/Combinatorial_map/include/CGAL/Dart_iterators.h index e0200fb45c6..e3907ff515c 100644 --- a/Combinatorial_map/include/CGAL/Dart_iterators.h +++ b/Combinatorial_map/include/CGAL/Dart_iterators.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Combinatorial_map/include/CGAL/internal/Combinatorial_map_functors.h b/Combinatorial_map/include/CGAL/internal/Combinatorial_map_functors.h index f7fed3e586d..5a0b1ef34e0 100644 --- a/Combinatorial_map/include/CGAL/internal/Combinatorial_map_functors.h +++ b/Combinatorial_map/include/CGAL/internal/Combinatorial_map_functors.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Combinatorial_map/include/CGAL/internal/Combinatorial_map_utility.h b/Combinatorial_map/include/CGAL/internal/Combinatorial_map_utility.h index 1a4eae9c65c..fee79ded604 100644 --- a/Combinatorial_map/include/CGAL/internal/Combinatorial_map_utility.h +++ b/Combinatorial_map/include/CGAL/internal/Combinatorial_map_utility.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Combinatorial_map/test/Combinatorial_map/Combinatorial_map_2_test.h b/Combinatorial_map/test/Combinatorial_map/Combinatorial_map_2_test.h index 5fd0fc9a180..84d41ffa051 100644 --- a/Combinatorial_map/test/Combinatorial_map/Combinatorial_map_2_test.h +++ b/Combinatorial_map/test/Combinatorial_map/Combinatorial_map_2_test.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Combinatorial_map/test/Combinatorial_map/Combinatorial_map_3_test.h b/Combinatorial_map/test/Combinatorial_map/Combinatorial_map_3_test.h index 6c51dc62fa3..c64015f1386 100644 --- a/Combinatorial_map/test/Combinatorial_map/Combinatorial_map_3_test.h +++ b/Combinatorial_map/test/Combinatorial_map/Combinatorial_map_3_test.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Conic_2/include/CGAL/ConicCPA2.h b/Conic_2/include/CGAL/ConicCPA2.h index 12ff8bc4915..d31f38b309d 100644 --- a/Conic_2/include/CGAL/ConicCPA2.h +++ b/Conic_2/include/CGAL/ConicCPA2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Conic_2/include/CGAL/ConicHPA2.h b/Conic_2/include/CGAL/ConicHPA2.h index 238d20352c2..53245365700 100644 --- a/Conic_2/include/CGAL/ConicHPA2.h +++ b/Conic_2/include/CGAL/ConicHPA2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Conic_2/include/CGAL/Conic_2.h b/Conic_2/include/CGAL/Conic_2.h index 46ded345e0a..499a12c6cc3 100644 --- a/Conic_2/include/CGAL/Conic_2.h +++ b/Conic_2/include/CGAL/Conic_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Conic_2/include/CGAL/Conic_misc.h b/Conic_2/include/CGAL/Conic_misc.h index f1cbb4808c2..98f34756d65 100644 --- a/Conic_2/include/CGAL/Conic_misc.h +++ b/Conic_2/include/CGAL/Conic_misc.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Developers_manual/doc_tex/Developers_manual/code_format.tex b/Developers_manual/doc_tex/Developers_manual/code_format.tex index c7a9702e62b..f99b8b8a7d4 100644 --- a/Developers_manual/doc_tex/Developers_manual/code_format.tex +++ b/Developers_manual/doc_tex/Developers_manual/code_format.tex @@ -384,7 +384,7 @@ identification of the file. The file header contains: \item a copyright notice, specifying all the years during which the file has been written or modified, as well as the owner(s) (typically the institutions employing the authors) of this work, -\item the corresponding license (at the moment, only LGPL v2.1 and QPL v1.0 +\item the corresponding license (at the moment, only LGPL v3 and QPL v1.0 are allowed in \cgal), and a pointer to the file containing its text in the \cgal\ distribution, \item a disclaimer notice, @@ -459,8 +459,8 @@ Here follows what this gives for a file under the LGPL : // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Distance_2/include/CGAL/squared_distance_2.h b/Distance_2/include/CGAL/squared_distance_2.h index 39455fe6647..09608da7ca1 100644 --- a/Distance_2/include/CGAL/squared_distance_2.h +++ b/Distance_2/include/CGAL/squared_distance_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Distance_2/include/CGAL/squared_distance_2_1.h b/Distance_2/include/CGAL/squared_distance_2_1.h index 7f18b408ebc..17590b17369 100644 --- a/Distance_2/include/CGAL/squared_distance_2_1.h +++ b/Distance_2/include/CGAL/squared_distance_2_1.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Distance_2/include/CGAL/squared_distance_2_2.h b/Distance_2/include/CGAL/squared_distance_2_2.h index d1f7688b515..6e8714c5f42 100644 --- a/Distance_2/include/CGAL/squared_distance_2_2.h +++ b/Distance_2/include/CGAL/squared_distance_2_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Distance_2/include/CGAL/squared_distance_utils.h b/Distance_2/include/CGAL/squared_distance_utils.h index c748c047cab..9c497d382cc 100644 --- a/Distance_2/include/CGAL/squared_distance_utils.h +++ b/Distance_2/include/CGAL/squared_distance_utils.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Distance_2/include/CGAL/wmult.h b/Distance_2/include/CGAL/wmult.h index fa6f057b11a..94d30a31513 100644 --- a/Distance_2/include/CGAL/wmult.h +++ b/Distance_2/include/CGAL/wmult.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Distance_3/include/CGAL/squared_distance_3.h b/Distance_3/include/CGAL/squared_distance_3.h index 8b0d44239e3..a757a29420b 100644 --- a/Distance_3/include/CGAL/squared_distance_3.h +++ b/Distance_3/include/CGAL/squared_distance_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Distance_3/include/CGAL/squared_distance_3_0.h b/Distance_3/include/CGAL/squared_distance_3_0.h index 8366a58e7d4..443c561686b 100644 --- a/Distance_3/include/CGAL/squared_distance_3_0.h +++ b/Distance_3/include/CGAL/squared_distance_3_0.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Distance_3/include/CGAL/squared_distance_3_1.h b/Distance_3/include/CGAL/squared_distance_3_1.h index 0af36bfd0c8..0f1e0bbe86d 100644 --- a/Distance_3/include/CGAL/squared_distance_3_1.h +++ b/Distance_3/include/CGAL/squared_distance_3_1.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Distance_3/include/CGAL/squared_distance_3_2.h b/Distance_3/include/CGAL/squared_distance_3_2.h index a28d7692cff..dac9b5ba6f2 100644 --- a/Distance_3/include/CGAL/squared_distance_3_2.h +++ b/Distance_3/include/CGAL/squared_distance_3_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Filtered_kernel/benchmark/Filtered_kernel/Orientation_3.h b/Filtered_kernel/benchmark/Filtered_kernel/Orientation_3.h index bc9392576b7..33107be48ae 100644 --- a/Filtered_kernel/benchmark/Filtered_kernel/Orientation_3.h +++ b/Filtered_kernel/benchmark/Filtered_kernel/Orientation_3.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Filtered_kernel/examples/Filtered_kernel/Cartesian_I.h b/Filtered_kernel/examples/Filtered_kernel/Cartesian_I.h index 2d2441a0fb7..82f3349404c 100644 --- a/Filtered_kernel/examples/Filtered_kernel/Cartesian_I.h +++ b/Filtered_kernel/examples/Filtered_kernel/Cartesian_I.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Filtered_kernel/include/CGAL/Filtered_kernel.h b/Filtered_kernel/include/CGAL/Filtered_kernel.h index 752b96b48d2..992ba9db30e 100644 --- a/Filtered_kernel/include/CGAL/Filtered_kernel.h +++ b/Filtered_kernel/include/CGAL/Filtered_kernel.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Filtered_kernel/include/CGAL/Filtered_kernel/Cartesian_coordinate_iterator_2.h b/Filtered_kernel/include/CGAL/Filtered_kernel/Cartesian_coordinate_iterator_2.h index 3c96a7b4528..eab2ae4c986 100644 --- a/Filtered_kernel/include/CGAL/Filtered_kernel/Cartesian_coordinate_iterator_2.h +++ b/Filtered_kernel/include/CGAL/Filtered_kernel/Cartesian_coordinate_iterator_2.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Filtered_kernel/include/CGAL/Filtered_kernel/Cartesian_coordinate_iterator_3.h b/Filtered_kernel/include/CGAL/Filtered_kernel/Cartesian_coordinate_iterator_3.h index 9506d3c521a..604e7f57bf9 100644 --- a/Filtered_kernel/include/CGAL/Filtered_kernel/Cartesian_coordinate_iterator_3.h +++ b/Filtered_kernel/include/CGAL/Filtered_kernel/Cartesian_coordinate_iterator_3.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Filtered_kernel/include/CGAL/Filtered_kernel_fwd.h b/Filtered_kernel/include/CGAL/Filtered_kernel_fwd.h index 24ff307cd87..5b718e520ab 100644 --- a/Filtered_kernel/include/CGAL/Filtered_kernel_fwd.h +++ b/Filtered_kernel/include/CGAL/Filtered_kernel_fwd.h @@ -4,8 +4,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Filtered_kernel/include/CGAL/Filtered_predicate.h b/Filtered_kernel/include/CGAL/Filtered_predicate.h index 565c53d8f36..e0fa0acfa55 100644 --- a/Filtered_kernel/include/CGAL/Filtered_predicate.h +++ b/Filtered_kernel/include/CGAL/Filtered_predicate.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Filtered_kernel/include/CGAL/Kernel_profiler.h b/Filtered_kernel/include/CGAL/Kernel_profiler.h index 1e123b2fe72..d7707d00dbf 100644 --- a/Filtered_kernel/include/CGAL/Kernel_profiler.h +++ b/Filtered_kernel/include/CGAL/Kernel_profiler.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Filtered_kernel/include/CGAL/Lazy.h b/Filtered_kernel/include/CGAL/Lazy.h index 721fe1006f7..86ac1f0018e 100644 --- a/Filtered_kernel/include/CGAL/Lazy.h +++ b/Filtered_kernel/include/CGAL/Lazy.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Filtered_kernel/include/CGAL/Lazy_kernel.h b/Filtered_kernel/include/CGAL/Lazy_kernel.h index 3a147a261a1..aab2d57d2cd 100644 --- a/Filtered_kernel/include/CGAL/Lazy_kernel.h +++ b/Filtered_kernel/include/CGAL/Lazy_kernel.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Filtered_kernel/include/CGAL/Restricted_double.h b/Filtered_kernel/include/CGAL/Restricted_double.h index 5a280543aa8..2d1bc89e993 100644 --- a/Filtered_kernel/include/CGAL/Restricted_double.h +++ b/Filtered_kernel/include/CGAL/Restricted_double.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Filtered_kernel/include/CGAL/Robust_construction.h b/Filtered_kernel/include/CGAL/Robust_construction.h index aa96f6a0656..4e6db7852eb 100644 --- a/Filtered_kernel/include/CGAL/Robust_construction.h +++ b/Filtered_kernel/include/CGAL/Robust_construction.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Filtered_kernel/include/CGAL/internal/Static_filters/Compare_squared_radius_3.h b/Filtered_kernel/include/CGAL/internal/Static_filters/Compare_squared_radius_3.h index 77dd963171a..22b604213ca 100644 --- a/Filtered_kernel/include/CGAL/internal/Static_filters/Compare_squared_radius_3.h +++ b/Filtered_kernel/include/CGAL/internal/Static_filters/Compare_squared_radius_3.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Filtered_kernel/include/CGAL/internal/Static_filters/Compare_y_at_x_2.h b/Filtered_kernel/include/CGAL/internal/Static_filters/Compare_y_at_x_2.h index 509659a2cc0..478e77b2819 100644 --- a/Filtered_kernel/include/CGAL/internal/Static_filters/Compare_y_at_x_2.h +++ b/Filtered_kernel/include/CGAL/internal/Static_filters/Compare_y_at_x_2.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Filtered_kernel/include/CGAL/internal/Static_filters/Coplanar_orientation_3.h b/Filtered_kernel/include/CGAL/internal/Static_filters/Coplanar_orientation_3.h index 81ead24d6f6..51a5bf106ac 100644 --- a/Filtered_kernel/include/CGAL/internal/Static_filters/Coplanar_orientation_3.h +++ b/Filtered_kernel/include/CGAL/internal/Static_filters/Coplanar_orientation_3.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Filtered_kernel/include/CGAL/internal/Static_filters/Coplanar_side_of_bounded_circle_3.h b/Filtered_kernel/include/CGAL/internal/Static_filters/Coplanar_side_of_bounded_circle_3.h index c8f9c0f5567..eab92e109d0 100644 --- a/Filtered_kernel/include/CGAL/internal/Static_filters/Coplanar_side_of_bounded_circle_3.h +++ b/Filtered_kernel/include/CGAL/internal/Static_filters/Coplanar_side_of_bounded_circle_3.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Filtered_kernel/include/CGAL/internal/Static_filters/Orientation_2.h b/Filtered_kernel/include/CGAL/internal/Static_filters/Orientation_2.h index 615fae33d22..508813bc336 100644 --- a/Filtered_kernel/include/CGAL/internal/Static_filters/Orientation_2.h +++ b/Filtered_kernel/include/CGAL/internal/Static_filters/Orientation_2.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Filtered_kernel/include/CGAL/internal/Static_filters/Orientation_3.h b/Filtered_kernel/include/CGAL/internal/Static_filters/Orientation_3.h index c1cbdc4a9d8..eed3bc3e159 100644 --- a/Filtered_kernel/include/CGAL/internal/Static_filters/Orientation_3.h +++ b/Filtered_kernel/include/CGAL/internal/Static_filters/Orientation_3.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Filtered_kernel/include/CGAL/internal/Static_filters/Side_of_oriented_circle_2.h b/Filtered_kernel/include/CGAL/internal/Static_filters/Side_of_oriented_circle_2.h index 4bb88413bc6..6b456ee39ed 100644 --- a/Filtered_kernel/include/CGAL/internal/Static_filters/Side_of_oriented_circle_2.h +++ b/Filtered_kernel/include/CGAL/internal/Static_filters/Side_of_oriented_circle_2.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Filtered_kernel/include/CGAL/internal/Static_filters/Side_of_oriented_sphere_3.h b/Filtered_kernel/include/CGAL/internal/Static_filters/Side_of_oriented_sphere_3.h index 1a994a6d253..baac316deff 100644 --- a/Filtered_kernel/include/CGAL/internal/Static_filters/Side_of_oriented_sphere_3.h +++ b/Filtered_kernel/include/CGAL/internal/Static_filters/Side_of_oriented_sphere_3.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Filtered_kernel/include/CGAL/internal/Static_filters/Static_filter_error.h b/Filtered_kernel/include/CGAL/internal/Static_filters/Static_filter_error.h index 56bdf8ececa..7adb0c2d3b0 100644 --- a/Filtered_kernel/include/CGAL/internal/Static_filters/Static_filter_error.h +++ b/Filtered_kernel/include/CGAL/internal/Static_filters/Static_filter_error.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Filtered_kernel/include/CGAL/internal/Static_filters/Static_filters.h b/Filtered_kernel/include/CGAL/internal/Static_filters/Static_filters.h index 233e171ff66..236d1a7b757 100644 --- a/Filtered_kernel/include/CGAL/internal/Static_filters/Static_filters.h +++ b/Filtered_kernel/include/CGAL/internal/Static_filters/Static_filters.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Filtered_kernel/include/CGAL/internal/Static_filters/tools.h b/Filtered_kernel/include/CGAL/internal/Static_filters/tools.h index e26895b6943..5b249bea9c8 100644 --- a/Filtered_kernel/include/CGAL/internal/Static_filters/tools.h +++ b/Filtered_kernel/include/CGAL/internal/Static_filters/tools.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Generator/demo/Generator/qt3/generator.cpp b/Generator/demo/Generator/qt3/generator.cpp index c6dc23940cf..a3768bb8736 100644 --- a/Generator/demo/Generator/qt3/generator.cpp +++ b/Generator/demo/Generator/qt3/generator.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Generator/include/CGAL/Random_convex_set_traits_2.h b/Generator/include/CGAL/Random_convex_set_traits_2.h index b1f03cc3d2d..6582e1393a9 100644 --- a/Generator/include/CGAL/Random_convex_set_traits_2.h +++ b/Generator/include/CGAL/Random_convex_set_traits_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Generator/include/CGAL/Random_polygon_2_sweep.h b/Generator/include/CGAL/Random_polygon_2_sweep.h index 6f59c38dfea..4de9942f505 100644 --- a/Generator/include/CGAL/Random_polygon_2_sweep.h +++ b/Generator/include/CGAL/Random_polygon_2_sweep.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Generator/include/CGAL/Random_polygon_traits_2.h b/Generator/include/CGAL/Random_polygon_traits_2.h index 187ccde85cd..6e97586c61a 100644 --- a/Generator/include/CGAL/Random_polygon_traits_2.h +++ b/Generator/include/CGAL/Random_polygon_traits_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Generator/include/CGAL/generators.h b/Generator/include/CGAL/generators.h index 31428900968..3e38f593bc8 100644 --- a/Generator/include/CGAL/generators.h +++ b/Generator/include/CGAL/generators.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Generator/include/CGAL/point_generators_2.h b/Generator/include/CGAL/point_generators_2.h index 7da9854a4ba..cce5d767385 100644 --- a/Generator/include/CGAL/point_generators_2.h +++ b/Generator/include/CGAL/point_generators_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Generator/include/CGAL/point_generators_3.h b/Generator/include/CGAL/point_generators_3.h index 73ffa54a858..7a262e50a86 100644 --- a/Generator/include/CGAL/point_generators_3.h +++ b/Generator/include/CGAL/point_generators_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Generator/include/CGAL/point_generators_d.h b/Generator/include/CGAL/point_generators_d.h index 03bf5cf9600..b9224c9de08 100644 --- a/Generator/include/CGAL/point_generators_d.h +++ b/Generator/include/CGAL/point_generators_d.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Generator/include/CGAL/random_convex_set_2.h b/Generator/include/CGAL/random_convex_set_2.h index d6892f2a58b..84ad51c07d4 100644 --- a/Generator/include/CGAL/random_convex_set_2.h +++ b/Generator/include/CGAL/random_convex_set_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Generator/include/CGAL/random_polygon_2.h b/Generator/include/CGAL/random_polygon_2.h index 5536739c6b4..248bb30249d 100644 --- a/Generator/include/CGAL/random_polygon_2.h +++ b/Generator/include/CGAL/random_polygon_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Generator/include/CGAL/random_selection.h b/Generator/include/CGAL/random_selection.h index 16822f3781c..0a4283b1279 100644 --- a/Generator/include/CGAL/random_selection.h +++ b/Generator/include/CGAL/random_selection.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Geomview/demo/Geomview/gv_terrain.cpp b/Geomview/demo/Geomview/gv_terrain.cpp index 6dc4dda7875..e618c1791f2 100644 --- a/Geomview/demo/Geomview/gv_terrain.cpp +++ b/Geomview/demo/Geomview/gv_terrain.cpp @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Geomview/demo/Geomview/input.cpp b/Geomview/demo/Geomview/input.cpp index c72adfa178e..36e9d13bdad 100644 --- a/Geomview/demo/Geomview/input.cpp +++ b/Geomview/demo/Geomview/input.cpp @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Geomview/demo/Geomview/kernel.cpp b/Geomview/demo/Geomview/kernel.cpp index 9578ff4f541..f4282523e98 100644 --- a/Geomview/demo/Geomview/kernel.cpp +++ b/Geomview/demo/Geomview/kernel.cpp @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Geomview/include/CGAL/IO/Geomview_stream.h b/Geomview/include/CGAL/IO/Geomview_stream.h index c7b821e5bde..b9d3ba957c0 100644 --- a/Geomview/include/CGAL/IO/Geomview_stream.h +++ b/Geomview/include/CGAL/IO/Geomview_stream.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Geomview/src/CGAL/Geomview_stream.cpp b/Geomview/src/CGAL/Geomview_stream.cpp index a292ace7bd9..b1554c615d0 100644 --- a/Geomview/src/CGAL/Geomview_stream.cpp +++ b/Geomview/src/CGAL/Geomview_stream.cpp @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/GraphicsView/include/CGAL/Qt/export.h b/GraphicsView/include/CGAL/Qt/export.h index c69f2404216..58cc1993747 100755 --- a/GraphicsView/include/CGAL/Qt/export.h +++ b/GraphicsView/include/CGAL/Qt/export.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/GraphicsView/include/CGAL/auto_link/Qt4.h b/GraphicsView/include/CGAL/auto_link/Qt4.h index 6d064053373..b8149769acf 100644 --- a/GraphicsView/include/CGAL/auto_link/Qt4.h +++ b/GraphicsView/include/CGAL/auto_link/Qt4.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/HalfedgeDS/include/CGAL/HalfedgeDS_const_decorator.h b/HalfedgeDS/include/CGAL/HalfedgeDS_const_decorator.h index 33613f3d3c1..da6ddf70583 100644 --- a/HalfedgeDS/include/CGAL/HalfedgeDS_const_decorator.h +++ b/HalfedgeDS/include/CGAL/HalfedgeDS_const_decorator.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/HalfedgeDS/include/CGAL/HalfedgeDS_decorator.h b/HalfedgeDS/include/CGAL/HalfedgeDS_decorator.h index 40d91f5c544..d6df5fb1b9a 100644 --- a/HalfedgeDS/include/CGAL/HalfedgeDS_decorator.h +++ b/HalfedgeDS/include/CGAL/HalfedgeDS_decorator.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/HalfedgeDS/include/CGAL/HalfedgeDS_default.h b/HalfedgeDS/include/CGAL/HalfedgeDS_default.h index b359f2012b7..c325485f332 100644 --- a/HalfedgeDS/include/CGAL/HalfedgeDS_default.h +++ b/HalfedgeDS/include/CGAL/HalfedgeDS_default.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/HalfedgeDS/include/CGAL/HalfedgeDS_face_base.h b/HalfedgeDS/include/CGAL/HalfedgeDS_face_base.h index 9c296daa35a..821644587c5 100644 --- a/HalfedgeDS/include/CGAL/HalfedgeDS_face_base.h +++ b/HalfedgeDS/include/CGAL/HalfedgeDS_face_base.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/HalfedgeDS/include/CGAL/HalfedgeDS_face_min_base.h b/HalfedgeDS/include/CGAL/HalfedgeDS_face_min_base.h index c1bb4ff5a06..81f589bdee6 100644 --- a/HalfedgeDS/include/CGAL/HalfedgeDS_face_min_base.h +++ b/HalfedgeDS/include/CGAL/HalfedgeDS_face_min_base.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/HalfedgeDS/include/CGAL/HalfedgeDS_halfedge_base.h b/HalfedgeDS/include/CGAL/HalfedgeDS_halfedge_base.h index d57f0c76a91..7f325410014 100644 --- a/HalfedgeDS/include/CGAL/HalfedgeDS_halfedge_base.h +++ b/HalfedgeDS/include/CGAL/HalfedgeDS_halfedge_base.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/HalfedgeDS/include/CGAL/HalfedgeDS_halfedge_min_base.h b/HalfedgeDS/include/CGAL/HalfedgeDS_halfedge_min_base.h index 0f4de0a496a..3ec4cfcbee3 100644 --- a/HalfedgeDS/include/CGAL/HalfedgeDS_halfedge_min_base.h +++ b/HalfedgeDS/include/CGAL/HalfedgeDS_halfedge_min_base.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/HalfedgeDS/include/CGAL/HalfedgeDS_items_2.h b/HalfedgeDS/include/CGAL/HalfedgeDS_items_2.h index c8b8aa3515b..c73660c195b 100644 --- a/HalfedgeDS/include/CGAL/HalfedgeDS_items_2.h +++ b/HalfedgeDS/include/CGAL/HalfedgeDS_items_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/HalfedgeDS/include/CGAL/HalfedgeDS_items_decorator.h b/HalfedgeDS/include/CGAL/HalfedgeDS_items_decorator.h index aa8fa556c89..3875fc361fc 100644 --- a/HalfedgeDS/include/CGAL/HalfedgeDS_items_decorator.h +++ b/HalfedgeDS/include/CGAL/HalfedgeDS_items_decorator.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/HalfedgeDS/include/CGAL/HalfedgeDS_iterator.h b/HalfedgeDS/include/CGAL/HalfedgeDS_iterator.h index f617c7a7737..e700ba175ba 100644 --- a/HalfedgeDS/include/CGAL/HalfedgeDS_iterator.h +++ b/HalfedgeDS/include/CGAL/HalfedgeDS_iterator.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/HalfedgeDS/include/CGAL/HalfedgeDS_iterator_adaptor.h b/HalfedgeDS/include/CGAL/HalfedgeDS_iterator_adaptor.h index ee578c10981..72ec52c8f58 100644 --- a/HalfedgeDS/include/CGAL/HalfedgeDS_iterator_adaptor.h +++ b/HalfedgeDS/include/CGAL/HalfedgeDS_iterator_adaptor.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/HalfedgeDS/include/CGAL/HalfedgeDS_list.h b/HalfedgeDS/include/CGAL/HalfedgeDS_list.h index ed50c935013..2250c3714e0 100644 --- a/HalfedgeDS/include/CGAL/HalfedgeDS_list.h +++ b/HalfedgeDS/include/CGAL/HalfedgeDS_list.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/HalfedgeDS/include/CGAL/HalfedgeDS_min_items.h b/HalfedgeDS/include/CGAL/HalfedgeDS_min_items.h index 2daae317e50..45f4c76fa37 100644 --- a/HalfedgeDS/include/CGAL/HalfedgeDS_min_items.h +++ b/HalfedgeDS/include/CGAL/HalfedgeDS_min_items.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/HalfedgeDS/include/CGAL/HalfedgeDS_vector.h b/HalfedgeDS/include/CGAL/HalfedgeDS_vector.h index 0dfbbd2fa63..f6cf04b215d 100644 --- a/HalfedgeDS/include/CGAL/HalfedgeDS_vector.h +++ b/HalfedgeDS/include/CGAL/HalfedgeDS_vector.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/HalfedgeDS/include/CGAL/HalfedgeDS_vertex_base.h b/HalfedgeDS/include/CGAL/HalfedgeDS_vertex_base.h index b44ca49f52e..b0508f352a9 100644 --- a/HalfedgeDS/include/CGAL/HalfedgeDS_vertex_base.h +++ b/HalfedgeDS/include/CGAL/HalfedgeDS_vertex_base.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/HalfedgeDS/include/CGAL/HalfedgeDS_vertex_min_base.h b/HalfedgeDS/include/CGAL/HalfedgeDS_vertex_min_base.h index d164bc1d0ad..1f25e06c24b 100644 --- a/HalfedgeDS/include/CGAL/HalfedgeDS_vertex_min_base.h +++ b/HalfedgeDS/include/CGAL/HalfedgeDS_vertex_min_base.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/HalfedgeDS/include/CGAL/Polyhedron_items_3.h b/HalfedgeDS/include/CGAL/Polyhedron_items_3.h index 136741a13cf..78e95ee4618 100644 --- a/HalfedgeDS/include/CGAL/Polyhedron_items_3.h +++ b/HalfedgeDS/include/CGAL/Polyhedron_items_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/HalfedgeDS/include/CGAL/halfedgeDS_cut_component.h b/HalfedgeDS/include/CGAL/halfedgeDS_cut_component.h index 12bd9d18fb5..8966de45722 100644 --- a/HalfedgeDS/include/CGAL/halfedgeDS_cut_component.h +++ b/HalfedgeDS/include/CGAL/halfedgeDS_cut_component.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/HalfedgeDS/include/CGAL/halfedgeds_connected_components.h b/HalfedgeDS/include/CGAL/halfedgeds_connected_components.h index f0b72950a97..da2ea3460ee 100644 --- a/HalfedgeDS/include/CGAL/halfedgeds_connected_components.h +++ b/HalfedgeDS/include/CGAL/halfedgeds_connected_components.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Hash_map/include/CGAL/Handle_hash_function.h b/Hash_map/include/CGAL/Handle_hash_function.h index 9c039a9d5ab..f7a87fdaf69 100644 --- a/Hash_map/include/CGAL/Handle_hash_function.h +++ b/Hash_map/include/CGAL/Handle_hash_function.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Hash_map/include/CGAL/Tools/chained_map.h b/Hash_map/include/CGAL/Tools/chained_map.h index d939339ebcf..240b50324c9 100644 --- a/Hash_map/include/CGAL/Tools/chained_map.h +++ b/Hash_map/include/CGAL/Tools/chained_map.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Hash_map/include/CGAL/Unique_hash_map.h b/Hash_map/include/CGAL/Unique_hash_map.h index 56a2a9d0d75..50043e9b756 100644 --- a/Hash_map/include/CGAL/Unique_hash_map.h +++ b/Hash_map/include/CGAL/Unique_hash_map.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Homogeneous_kernel/include/CGAL/Homogeneous.h b/Homogeneous_kernel/include/CGAL/Homogeneous.h index e6d805e501f..6fa9bd7bafb 100644 --- a/Homogeneous_kernel/include/CGAL/Homogeneous.h +++ b/Homogeneous_kernel/include/CGAL/Homogeneous.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Homogeneous_kernel/include/CGAL/Homogeneous/Aff_transformationH2.h b/Homogeneous_kernel/include/CGAL/Homogeneous/Aff_transformationH2.h index e14b3f3bc7c..117d6eaef3e 100644 --- a/Homogeneous_kernel/include/CGAL/Homogeneous/Aff_transformationH2.h +++ b/Homogeneous_kernel/include/CGAL/Homogeneous/Aff_transformationH2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Homogeneous_kernel/include/CGAL/Homogeneous/Aff_transformationH3.h b/Homogeneous_kernel/include/CGAL/Homogeneous/Aff_transformationH3.h index 4d878275946..58ad8d18a9f 100644 --- a/Homogeneous_kernel/include/CGAL/Homogeneous/Aff_transformationH3.h +++ b/Homogeneous_kernel/include/CGAL/Homogeneous/Aff_transformationH3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Homogeneous_kernel/include/CGAL/Homogeneous/CircleH2.h b/Homogeneous_kernel/include/CGAL/Homogeneous/CircleH2.h index e2223d24810..c5ce9c1c776 100644 --- a/Homogeneous_kernel/include/CGAL/Homogeneous/CircleH2.h +++ b/Homogeneous_kernel/include/CGAL/Homogeneous/CircleH2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Homogeneous_kernel/include/CGAL/Homogeneous/Data_accessorH2.h b/Homogeneous_kernel/include/CGAL/Homogeneous/Data_accessorH2.h index bbeb1b4bb87..abae699f62f 100644 --- a/Homogeneous_kernel/include/CGAL/Homogeneous/Data_accessorH2.h +++ b/Homogeneous_kernel/include/CGAL/Homogeneous/Data_accessorH2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Homogeneous_kernel/include/CGAL/Homogeneous/DirectionH2.h b/Homogeneous_kernel/include/CGAL/Homogeneous/DirectionH2.h index 86a355ed7eb..61909ff49f8 100644 --- a/Homogeneous_kernel/include/CGAL/Homogeneous/DirectionH2.h +++ b/Homogeneous_kernel/include/CGAL/Homogeneous/DirectionH2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Homogeneous_kernel/include/CGAL/Homogeneous/DirectionH3.h b/Homogeneous_kernel/include/CGAL/Homogeneous/DirectionH3.h index f49c075cc8b..4848bf6631a 100644 --- a/Homogeneous_kernel/include/CGAL/Homogeneous/DirectionH3.h +++ b/Homogeneous_kernel/include/CGAL/Homogeneous/DirectionH3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Homogeneous_kernel/include/CGAL/Homogeneous/Homogeneous_base.h b/Homogeneous_kernel/include/CGAL/Homogeneous/Homogeneous_base.h index b8e39db45d9..a3ddff9e0cc 100644 --- a/Homogeneous_kernel/include/CGAL/Homogeneous/Homogeneous_base.h +++ b/Homogeneous_kernel/include/CGAL/Homogeneous/Homogeneous_base.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Homogeneous_kernel/include/CGAL/Homogeneous/Iso_cuboidH3.h b/Homogeneous_kernel/include/CGAL/Homogeneous/Iso_cuboidH3.h index 605912173fe..e9097ed552f 100644 --- a/Homogeneous_kernel/include/CGAL/Homogeneous/Iso_cuboidH3.h +++ b/Homogeneous_kernel/include/CGAL/Homogeneous/Iso_cuboidH3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Homogeneous_kernel/include/CGAL/Homogeneous/Iso_rectangleH2.h b/Homogeneous_kernel/include/CGAL/Homogeneous/Iso_rectangleH2.h index 9cdd45209b9..e6443d4e5c3 100644 --- a/Homogeneous_kernel/include/CGAL/Homogeneous/Iso_rectangleH2.h +++ b/Homogeneous_kernel/include/CGAL/Homogeneous/Iso_rectangleH2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Homogeneous_kernel/include/CGAL/Homogeneous/LineH2.h b/Homogeneous_kernel/include/CGAL/Homogeneous/LineH2.h index f04387087e3..01e5801567d 100644 --- a/Homogeneous_kernel/include/CGAL/Homogeneous/LineH2.h +++ b/Homogeneous_kernel/include/CGAL/Homogeneous/LineH2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Homogeneous_kernel/include/CGAL/Homogeneous/PlaneH3.h b/Homogeneous_kernel/include/CGAL/Homogeneous/PlaneH3.h index 175050a0e71..a80aeaabcf0 100644 --- a/Homogeneous_kernel/include/CGAL/Homogeneous/PlaneH3.h +++ b/Homogeneous_kernel/include/CGAL/Homogeneous/PlaneH3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Homogeneous_kernel/include/CGAL/Homogeneous/PointH2.h b/Homogeneous_kernel/include/CGAL/Homogeneous/PointH2.h index aed0b1bc10d..a32e448d389 100644 --- a/Homogeneous_kernel/include/CGAL/Homogeneous/PointH2.h +++ b/Homogeneous_kernel/include/CGAL/Homogeneous/PointH2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Homogeneous_kernel/include/CGAL/Homogeneous/PointH3.h b/Homogeneous_kernel/include/CGAL/Homogeneous/PointH3.h index c969a7dc933..c24bf0615af 100644 --- a/Homogeneous_kernel/include/CGAL/Homogeneous/PointH3.h +++ b/Homogeneous_kernel/include/CGAL/Homogeneous/PointH3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Homogeneous_kernel/include/CGAL/Homogeneous/RayH3.h b/Homogeneous_kernel/include/CGAL/Homogeneous/RayH3.h index 2eceeb4a332..8dd63794be6 100644 --- a/Homogeneous_kernel/include/CGAL/Homogeneous/RayH3.h +++ b/Homogeneous_kernel/include/CGAL/Homogeneous/RayH3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Homogeneous_kernel/include/CGAL/Homogeneous/SphereH3.h b/Homogeneous_kernel/include/CGAL/Homogeneous/SphereH3.h index 6be49676887..fc9c8342a4e 100644 --- a/Homogeneous_kernel/include/CGAL/Homogeneous/SphereH3.h +++ b/Homogeneous_kernel/include/CGAL/Homogeneous/SphereH3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Homogeneous_kernel/include/CGAL/Homogeneous/VectorH2.h b/Homogeneous_kernel/include/CGAL/Homogeneous/VectorH2.h index c184f4e9239..d342be92316 100644 --- a/Homogeneous_kernel/include/CGAL/Homogeneous/VectorH2.h +++ b/Homogeneous_kernel/include/CGAL/Homogeneous/VectorH2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Homogeneous_kernel/include/CGAL/Homogeneous/VectorH3.h b/Homogeneous_kernel/include/CGAL/Homogeneous/VectorH3.h index 4253fe567c8..625738d61f5 100644 --- a/Homogeneous_kernel/include/CGAL/Homogeneous/VectorH3.h +++ b/Homogeneous_kernel/include/CGAL/Homogeneous/VectorH3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Homogeneous_kernel/include/CGAL/Homogeneous/basic_constructionsH2.h b/Homogeneous_kernel/include/CGAL/Homogeneous/basic_constructionsH2.h index 56a58bc122d..15a5dd5992a 100644 --- a/Homogeneous_kernel/include/CGAL/Homogeneous/basic_constructionsH2.h +++ b/Homogeneous_kernel/include/CGAL/Homogeneous/basic_constructionsH2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Homogeneous_kernel/include/CGAL/Homogeneous/basic_constructionsH3.h b/Homogeneous_kernel/include/CGAL/Homogeneous/basic_constructionsH3.h index 082e162ce23..8fe6c0dfbd2 100644 --- a/Homogeneous_kernel/include/CGAL/Homogeneous/basic_constructionsH3.h +++ b/Homogeneous_kernel/include/CGAL/Homogeneous/basic_constructionsH3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Homogeneous_kernel/include/CGAL/Homogeneous/distance_predicatesH2.h b/Homogeneous_kernel/include/CGAL/Homogeneous/distance_predicatesH2.h index af3e48b0e5a..02bdd767801 100644 --- a/Homogeneous_kernel/include/CGAL/Homogeneous/distance_predicatesH2.h +++ b/Homogeneous_kernel/include/CGAL/Homogeneous/distance_predicatesH2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Homogeneous_kernel/include/CGAL/Homogeneous/distance_predicatesH3.h b/Homogeneous_kernel/include/CGAL/Homogeneous/distance_predicatesH3.h index f01040f6001..edfea45721e 100644 --- a/Homogeneous_kernel/include/CGAL/Homogeneous/distance_predicatesH3.h +++ b/Homogeneous_kernel/include/CGAL/Homogeneous/distance_predicatesH3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Homogeneous_kernel/include/CGAL/Homogeneous/function_objects.h b/Homogeneous_kernel/include/CGAL/Homogeneous/function_objects.h index 0d0986f60ee..fe7292d5051 100644 --- a/Homogeneous_kernel/include/CGAL/Homogeneous/function_objects.h +++ b/Homogeneous_kernel/include/CGAL/Homogeneous/function_objects.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Homogeneous_kernel/include/CGAL/Homogeneous/predicates_on_directionsH2.h b/Homogeneous_kernel/include/CGAL/Homogeneous/predicates_on_directionsH2.h index 7336fcf0708..19c79b2bf0a 100644 --- a/Homogeneous_kernel/include/CGAL/Homogeneous/predicates_on_directionsH2.h +++ b/Homogeneous_kernel/include/CGAL/Homogeneous/predicates_on_directionsH2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Homogeneous_kernel/include/CGAL/Homogeneous/predicates_on_pointsH2.h b/Homogeneous_kernel/include/CGAL/Homogeneous/predicates_on_pointsH2.h index 6d7591ee0b7..e5df601c86a 100644 --- a/Homogeneous_kernel/include/CGAL/Homogeneous/predicates_on_pointsH2.h +++ b/Homogeneous_kernel/include/CGAL/Homogeneous/predicates_on_pointsH2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Homogeneous_kernel/include/CGAL/Homogeneous/predicates_on_pointsH3.h b/Homogeneous_kernel/include/CGAL/Homogeneous/predicates_on_pointsH3.h index 52fee070803..b1f809189b0 100644 --- a/Homogeneous_kernel/include/CGAL/Homogeneous/predicates_on_pointsH3.h +++ b/Homogeneous_kernel/include/CGAL/Homogeneous/predicates_on_pointsH3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Homogeneous_kernel/include/CGAL/Homogeneous_converter.h b/Homogeneous_kernel/include/CGAL/Homogeneous_converter.h index 94a19622bc5..8de3613f523 100644 --- a/Homogeneous_kernel/include/CGAL/Homogeneous_converter.h +++ b/Homogeneous_kernel/include/CGAL/Homogeneous_converter.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Homogeneous_kernel/include/CGAL/Simple_homogeneous.h b/Homogeneous_kernel/include/CGAL/Simple_homogeneous.h index 5806422f01a..b47431b4e3f 100644 --- a/Homogeneous_kernel/include/CGAL/Simple_homogeneous.h +++ b/Homogeneous_kernel/include/CGAL/Simple_homogeneous.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/LICENSE b/Installation/LICENSE index 5a33da7cfc9..49269582208 100644 --- a/Installation/LICENSE +++ b/Installation/LICENSE @@ -10,7 +10,7 @@ The source code of the CGAL library can be found in the directories exception of "include/CGAL/CORE", "include/CGAL/OpenNL"). It is specified in each file of the CGAL library which license applies to it. This is either the GNU Lesser General Public License -(as published by the Free Software Foundation; version 2.1 of the License) +(as published by the Free Software Foundation; version 3 of the License) or the Q Public License (version 1.0), *depending on each file*. The texts of both licenses can be found in the files LICENSE.LGPL and LICENSE.QPL. diff --git a/Installation/cmake/modules/test_MPFI.cpp b/Installation/cmake/modules/test_MPFI.cpp index e8f9c72f51a..7925bb9d7be 100644 --- a/Installation/cmake/modules/test_MPFI.cpp +++ b/Installation/cmake/modules/test_MPFI.cpp @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/config/support/print_BOOST_version.cpp b/Installation/config/support/print_BOOST_version.cpp index 9d016860b6b..82052c40eb0 100644 --- a/Installation/config/support/print_BOOST_version.cpp +++ b/Installation/config/support/print_BOOST_version.cpp @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/config/support/print_GCC_version.cpp b/Installation/config/support/print_GCC_version.cpp index e41acef3ff1..e822c08dbfe 100644 --- a/Installation/config/support/print_GCC_version.cpp +++ b/Installation/config/support/print_GCC_version.cpp @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/config/support/print_GMP_version.cpp b/Installation/config/support/print_GMP_version.cpp index d3ddf23616c..a6bc8f3ccf2 100644 --- a/Installation/config/support/print_GMP_version.cpp +++ b/Installation/config/support/print_GMP_version.cpp @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/config/support/print_IntelCompiler_version.cpp b/Installation/config/support/print_IntelCompiler_version.cpp index 030795d7fe4..47f625a5ccc 100644 --- a/Installation/config/support/print_IntelCompiler_version.cpp +++ b/Installation/config/support/print_IntelCompiler_version.cpp @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/config/support/print_LEDA_version.cpp b/Installation/config/support/print_LEDA_version.cpp index ca832f54185..1f972c5c6e0 100644 --- a/Installation/config/support/print_LEDA_version.cpp +++ b/Installation/config/support/print_LEDA_version.cpp @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/config/support/print_MPFI_version.cpp b/Installation/config/support/print_MPFI_version.cpp index ac08761a2b8..c009a70289d 100644 --- a/Installation/config/support/print_MPFI_version.cpp +++ b/Installation/config/support/print_MPFI_version.cpp @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/config/support/print_MPFR_version.cpp b/Installation/config/support/print_MPFR_version.cpp index 9fa2822e1ad..1f1492be060 100644 --- a/Installation/config/support/print_MPFR_version.cpp +++ b/Installation/config/support/print_MPFR_version.cpp @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/config/support/print_OPENGL_version.cpp b/Installation/config/support/print_OPENGL_version.cpp index 3491e244757..dc37aad9550 100644 --- a/Installation/config/support/print_OPENGL_version.cpp +++ b/Installation/config/support/print_OPENGL_version.cpp @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/config/support/print_QT4_version.cpp b/Installation/config/support/print_QT4_version.cpp index ce2c414953f..2398f507795 100644 --- a/Installation/config/support/print_QT4_version.cpp +++ b/Installation/config/support/print_QT4_version.cpp @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/config/support/print_QT_version.cpp b/Installation/config/support/print_QT_version.cpp index 046acfc3b54..c234aaaf76c 100644 --- a/Installation/config/support/print_QT_version.cpp +++ b/Installation/config/support/print_QT_version.cpp @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/config/support/print_TAUCS_version.cpp b/Installation/config/support/print_TAUCS_version.cpp index 25767ba67b7..6aaf3c149d4 100644 --- a/Installation/config/support/print_TAUCS_version.cpp +++ b/Installation/config/support/print_TAUCS_version.cpp @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/config/support/print_ZLIB_version.cpp b/Installation/config/support/print_ZLIB_version.cpp index 2cf61f68fe4..f145b4c7213 100644 --- a/Installation/config/support/print_ZLIB_version.cpp +++ b/Installation/config/support/print_ZLIB_version.cpp @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/config/support/test_ATLAS.cpp b/Installation/config/support/test_ATLAS.cpp index 66d0960d7d1..122c25fd73c 100644 --- a/Installation/config/support/test_ATLAS.cpp +++ b/Installation/config/support/test_ATLAS.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/config/support/test_BLAS.cpp b/Installation/config/support/test_BLAS.cpp index 4f8114d8c94..c5c26727f93 100644 --- a/Installation/config/support/test_BLAS.cpp +++ b/Installation/config/support/test_BLAS.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/config/support/test_BOOST.cpp b/Installation/config/support/test_BOOST.cpp index c1f5caf96c7..21b26d09ef4 100644 --- a/Installation/config/support/test_BOOST.cpp +++ b/Installation/config/support/test_BOOST.cpp @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/config/support/test_BOOST_PROGRAM_OPTIONS.cpp b/Installation/config/support/test_BOOST_PROGRAM_OPTIONS.cpp index 17350ac9166..95e397fc602 100644 --- a/Installation/config/support/test_BOOST_PROGRAM_OPTIONS.cpp +++ b/Installation/config/support/test_BOOST_PROGRAM_OPTIONS.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/config/support/test_BOOST_THREAD.cpp b/Installation/config/support/test_BOOST_THREAD.cpp index 581a527e9cf..08632092148 100644 --- a/Installation/config/support/test_BOOST_THREAD.cpp +++ b/Installation/config/support/test_BOOST_THREAD.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/config/support/test_GMP.cpp b/Installation/config/support/test_GMP.cpp index 29a18aa75da..f83698519cf 100644 --- a/Installation/config/support/test_GMP.cpp +++ b/Installation/config/support/test_GMP.cpp @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/config/support/test_GMPXX.cpp b/Installation/config/support/test_GMPXX.cpp index 5f163eb2961..b3a29a28bc4 100644 --- a/Installation/config/support/test_GMPXX.cpp +++ b/Installation/config/support/test_GMPXX.cpp @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/config/support/test_LAPACK.cpp b/Installation/config/support/test_LAPACK.cpp index f58d0f63eb5..1bf00330cfe 100644 --- a/Installation/config/support/test_LAPACK.cpp +++ b/Installation/config/support/test_LAPACK.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/config/support/test_LEDA.cpp b/Installation/config/support/test_LEDA.cpp index f0a373649a9..4f4b2813c7f 100644 --- a/Installation/config/support/test_LEDA.cpp +++ b/Installation/config/support/test_LEDA.cpp @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/config/support/test_LEDAWIN.cpp b/Installation/config/support/test_LEDAWIN.cpp index 439c4c4d666..af21ca9de4c 100644 --- a/Installation/config/support/test_LEDAWIN.cpp +++ b/Installation/config/support/test_LEDAWIN.cpp @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/config/support/test_LIDIA.cpp b/Installation/config/support/test_LIDIA.cpp index fa389bfa1c1..f4978b0212c 100644 --- a/Installation/config/support/test_LIDIA.cpp +++ b/Installation/config/support/test_LIDIA.cpp @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/config/support/test_MPFR.cpp b/Installation/config/support/test_MPFR.cpp index 129493f8816..e3755af4788 100644 --- a/Installation/config/support/test_MPFR.cpp +++ b/Installation/config/support/test_MPFR.cpp @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/config/support/test_OPENGL.cpp b/Installation/config/support/test_OPENGL.cpp index b0a20e8ffd0..24aec350329 100644 --- a/Installation/config/support/test_OPENGL.cpp +++ b/Installation/config/support/test_OPENGL.cpp @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/config/support/test_QT.cpp b/Installation/config/support/test_QT.cpp index ef543d01706..a42b9fe73da 100644 --- a/Installation/config/support/test_QT.cpp +++ b/Installation/config/support/test_QT.cpp @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/config/support/test_TAUCS.cpp b/Installation/config/support/test_TAUCS.cpp index f6b4b1ef918..746e17cba0e 100644 --- a/Installation/config/support/test_TAUCS.cpp +++ b/Installation/config/support/test_TAUCS.cpp @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/config/support/test_X11.cpp b/Installation/config/support/test_X11.cpp index af97ba5a75d..0a8ba8d8bb3 100644 --- a/Installation/config/support/test_X11.cpp +++ b/Installation/config/support/test_X11.cpp @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/config/support/test_ZLIB.cpp b/Installation/config/support/test_ZLIB.cpp index c3133f34ef8..191242b7467 100644 --- a/Installation/config/support/test_ZLIB.cpp +++ b/Installation/config/support/test_ZLIB.cpp @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/config/testfiles/CGAL_CFG_ARRAY_MEMBER_INITIALIZATION_BUG.cpp b/Installation/config/testfiles/CGAL_CFG_ARRAY_MEMBER_INITIALIZATION_BUG.cpp index 054e6e18cf2..fddd466fdd8 100644 --- a/Installation/config/testfiles/CGAL_CFG_ARRAY_MEMBER_INITIALIZATION_BUG.cpp +++ b/Installation/config/testfiles/CGAL_CFG_ARRAY_MEMBER_INITIALIZATION_BUG.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/config/testfiles/CGAL_CFG_DENORMALS_COMPILE_BUG.cpp b/Installation/config/testfiles/CGAL_CFG_DENORMALS_COMPILE_BUG.cpp index 19f54c4bf46..3a698f0e7a9 100644 --- a/Installation/config/testfiles/CGAL_CFG_DENORMALS_COMPILE_BUG.cpp +++ b/Installation/config/testfiles/CGAL_CFG_DENORMALS_COMPILE_BUG.cpp @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/config/testfiles/CGAL_CFG_FPU_ROUNDING_MODE_UNWINDING_VC_BUG.cpp b/Installation/config/testfiles/CGAL_CFG_FPU_ROUNDING_MODE_UNWINDING_VC_BUG.cpp index cd7fd169258..f61eb63ee6f 100644 --- a/Installation/config/testfiles/CGAL_CFG_FPU_ROUNDING_MODE_UNWINDING_VC_BUG.cpp +++ b/Installation/config/testfiles/CGAL_CFG_FPU_ROUNDING_MODE_UNWINDING_VC_BUG.cpp @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/config/testfiles/CGAL_CFG_IEEE_754_BUG.cpp b/Installation/config/testfiles/CGAL_CFG_IEEE_754_BUG.cpp index 6a20601d0d1..cb089866cd4 100644 --- a/Installation/config/testfiles/CGAL_CFG_IEEE_754_BUG.cpp +++ b/Installation/config/testfiles/CGAL_CFG_IEEE_754_BUG.cpp @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/config/testfiles/CGAL_CFG_ISTREAM_INT_BUG.cpp b/Installation/config/testfiles/CGAL_CFG_ISTREAM_INT_BUG.cpp index 0bd9de50b70..c5787fd0045 100644 --- a/Installation/config/testfiles/CGAL_CFG_ISTREAM_INT_BUG.cpp +++ b/Installation/config/testfiles/CGAL_CFG_ISTREAM_INT_BUG.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/config/testfiles/CGAL_CFG_LONGNAME_BUG.cpp b/Installation/config/testfiles/CGAL_CFG_LONGNAME_BUG.cpp index 33ec527cb11..06db4d3d4a8 100644 --- a/Installation/config/testfiles/CGAL_CFG_LONGNAME_BUG.cpp +++ b/Installation/config/testfiles/CGAL_CFG_LONGNAME_BUG.cpp @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/config/testfiles/CGAL_CFG_MATCHING_BUG_5.cpp b/Installation/config/testfiles/CGAL_CFG_MATCHING_BUG_5.cpp index c0fa5920eaa..103b247c3cf 100644 --- a/Installation/config/testfiles/CGAL_CFG_MATCHING_BUG_5.cpp +++ b/Installation/config/testfiles/CGAL_CFG_MATCHING_BUG_5.cpp @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/config/testfiles/CGAL_CFG_MATCHING_BUG_6.cpp b/Installation/config/testfiles/CGAL_CFG_MATCHING_BUG_6.cpp index db04becc3a6..a5278e821a7 100644 --- a/Installation/config/testfiles/CGAL_CFG_MATCHING_BUG_6.cpp +++ b/Installation/config/testfiles/CGAL_CFG_MATCHING_BUG_6.cpp @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/config/testfiles/CGAL_CFG_NESTED_CLASS_FRIEND_DECLARATION_BUG.cpp b/Installation/config/testfiles/CGAL_CFG_NESTED_CLASS_FRIEND_DECLARATION_BUG.cpp index 6f87031c13e..61c47f9b7a7 100644 --- a/Installation/config/testfiles/CGAL_CFG_NESTED_CLASS_FRIEND_DECLARATION_BUG.cpp +++ b/Installation/config/testfiles/CGAL_CFG_NESTED_CLASS_FRIEND_DECLARATION_BUG.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_ARRAY.cpp b/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_ARRAY.cpp index b2d71b53f53..1c566fbc291 100644 --- a/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_ARRAY.cpp +++ b/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_ARRAY.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_AUTO.cpp b/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_AUTO.cpp index 3bbadfa13ac..c0283333378 100644 --- a/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_AUTO.cpp +++ b/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_AUTO.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_COPY_N.cpp b/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_COPY_N.cpp index 562effc9c69..959c53bb36f 100644 --- a/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_COPY_N.cpp +++ b/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_COPY_N.cpp @@ -5,8 +5,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_DECLTYPE.cpp b/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_DECLTYPE.cpp index 84334358eed..139c2ccfe2c 100644 --- a/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_DECLTYPE.cpp +++ b/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_DECLTYPE.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_DEFAULT_TEMPLATE_ARGUMENTS_FOR_FUNCTION_TEMPLATES.cpp b/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_DEFAULT_TEMPLATE_ARGUMENTS_FOR_FUNCTION_TEMPLATES.cpp index aabdf8a5e64..dcaf1c5ff0c 100644 --- a/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_DEFAULT_TEMPLATE_ARGUMENTS_FOR_FUNCTION_TEMPLATES.cpp +++ b/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_DEFAULT_TEMPLATE_ARGUMENTS_FOR_FUNCTION_TEMPLATES.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_DELEGATING_CONSTRUCTORS.cpp b/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_DELEGATING_CONSTRUCTORS.cpp index 3adb34f74b1..143015e9bd7 100644 --- a/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_DELEGATING_CONSTRUCTORS.cpp +++ b/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_DELEGATING_CONSTRUCTORS.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_DELETED_AND_DEFAULT_FUNCTIONS.cpp b/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_DELETED_AND_DEFAULT_FUNCTIONS.cpp index 006d12d2e8d..6770cd82395 100644 --- a/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_DELETED_AND_DEFAULT_FUNCTIONS.cpp +++ b/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_DELETED_AND_DEFAULT_FUNCTIONS.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_INITIALIZER_LISTS.cpp b/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_INITIALIZER_LISTS.cpp index 8a313874a59..c7c2fdd4d01 100644 --- a/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_INITIALIZER_LISTS.cpp +++ b/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_INITIALIZER_LISTS.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_ISFINITE.cpp b/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_ISFINITE.cpp index 1f495cd0170..585c1446b63 100644 --- a/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_ISFINITE.cpp +++ b/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_ISFINITE.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_LAMBDAS.cpp b/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_LAMBDAS.cpp index 2940dc1df08..2a5579a1bd1 100644 --- a/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_LAMBDAS.cpp +++ b/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_LAMBDAS.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_LONG_LONG.cpp b/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_LONG_LONG.cpp index 723f71094c0..703731fa92e 100644 --- a/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_LONG_LONG.cpp +++ b/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_LONG_LONG.cpp @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_NEXT_PREV.cpp b/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_NEXT_PREV.cpp index 3ee19fa79d6..0a26a7db529 100644 --- a/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_NEXT_PREV.cpp +++ b/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_NEXT_PREV.cpp @@ -6,8 +6,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_RVALUE_REFERENCE.cpp b/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_RVALUE_REFERENCE.cpp index aa04fd12cdb..1c7b3a0e089 100644 --- a/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_RVALUE_REFERENCE.cpp +++ b/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_RVALUE_REFERENCE.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_STATIC_ASSERT.cpp b/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_STATIC_ASSERT.cpp index 9fe6379dd13..228575a7e1b 100644 --- a/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_STATIC_ASSERT.cpp +++ b/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_STATIC_ASSERT.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_TUPLE.cpp b/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_TUPLE.cpp index 0b43508345b..dc47444ae0e 100644 --- a/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_TUPLE.cpp +++ b/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_TUPLE.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_VARIADIC_TEMPLATES.cpp b/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_VARIADIC_TEMPLATES.cpp index d54c83c49a6..2b653de6d97 100644 --- a/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_VARIADIC_TEMPLATES.cpp +++ b/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_VARIADIC_TEMPLATES.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/config/testfiles/CGAL_CFG_NO_LIMITS.cpp b/Installation/config/testfiles/CGAL_CFG_NO_LIMITS.cpp index a1423ef673d..15337384cca 100644 --- a/Installation/config/testfiles/CGAL_CFG_NO_LIMITS.cpp +++ b/Installation/config/testfiles/CGAL_CFG_NO_LIMITS.cpp @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/config/testfiles/CGAL_CFG_NO_LOGICAL_OPERATORS_ALTERNATIVES.cpp b/Installation/config/testfiles/CGAL_CFG_NO_LOGICAL_OPERATORS_ALTERNATIVES.cpp index 39527e8e0a1..6b702dcff7b 100644 --- a/Installation/config/testfiles/CGAL_CFG_NO_LOGICAL_OPERATORS_ALTERNATIVES.cpp +++ b/Installation/config/testfiles/CGAL_CFG_NO_LOGICAL_OPERATORS_ALTERNATIVES.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/config/testfiles/CGAL_CFG_NO_MESSAGE_PRAGMA_BUG.cpp b/Installation/config/testfiles/CGAL_CFG_NO_MESSAGE_PRAGMA_BUG.cpp index 285c2209dad..0558a858886 100644 --- a/Installation/config/testfiles/CGAL_CFG_NO_MESSAGE_PRAGMA_BUG.cpp +++ b/Installation/config/testfiles/CGAL_CFG_NO_MESSAGE_PRAGMA_BUG.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/config/testfiles/CGAL_CFG_NO_NEXTAFTER.cpp b/Installation/config/testfiles/CGAL_CFG_NO_NEXTAFTER.cpp index 32f0d4c1ef3..88d389cc872 100644 --- a/Installation/config/testfiles/CGAL_CFG_NO_NEXTAFTER.cpp +++ b/Installation/config/testfiles/CGAL_CFG_NO_NEXTAFTER.cpp @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/config/testfiles/CGAL_CFG_NO_STATEMENT_EXPRESSIONS.cpp b/Installation/config/testfiles/CGAL_CFG_NO_STATEMENT_EXPRESSIONS.cpp index a76b7213d4e..d867924792c 100644 --- a/Installation/config/testfiles/CGAL_CFG_NO_STATEMENT_EXPRESSIONS.cpp +++ b/Installation/config/testfiles/CGAL_CFG_NO_STATEMENT_EXPRESSIONS.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/config/testfiles/CGAL_CFG_NO_STL.cpp b/Installation/config/testfiles/CGAL_CFG_NO_STL.cpp index 4599253a8ba..e19e3dadef9 100644 --- a/Installation/config/testfiles/CGAL_CFG_NO_STL.cpp +++ b/Installation/config/testfiles/CGAL_CFG_NO_STL.cpp @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/config/testfiles/CGAL_CFG_NO_TMPL_IN_TMPL_PARAM.cpp b/Installation/config/testfiles/CGAL_CFG_NO_TMPL_IN_TMPL_PARAM.cpp index de975da9d40..97a053b0d3a 100644 --- a/Installation/config/testfiles/CGAL_CFG_NO_TMPL_IN_TMPL_PARAM.cpp +++ b/Installation/config/testfiles/CGAL_CFG_NO_TMPL_IN_TMPL_PARAM.cpp @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/config/testfiles/CGAL_CFG_NO_TR1_ARRAY.cpp b/Installation/config/testfiles/CGAL_CFG_NO_TR1_ARRAY.cpp index 0e0fae0a6ef..a3ef68a721a 100644 --- a/Installation/config/testfiles/CGAL_CFG_NO_TR1_ARRAY.cpp +++ b/Installation/config/testfiles/CGAL_CFG_NO_TR1_ARRAY.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/config/testfiles/CGAL_CFG_NO_TR1_TUPLE.cpp b/Installation/config/testfiles/CGAL_CFG_NO_TR1_TUPLE.cpp index a9d0d4e5e26..c0ca14bd80f 100644 --- a/Installation/config/testfiles/CGAL_CFG_NO_TR1_TUPLE.cpp +++ b/Installation/config/testfiles/CGAL_CFG_NO_TR1_TUPLE.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/config/testfiles/CGAL_CFG_NO_WARNING_CPP_DIRECTIVE_BUG.cpp b/Installation/config/testfiles/CGAL_CFG_NO_WARNING_CPP_DIRECTIVE_BUG.cpp index 6037060d50a..cc1ff11f05f 100644 --- a/Installation/config/testfiles/CGAL_CFG_NO_WARNING_CPP_DIRECTIVE_BUG.cpp +++ b/Installation/config/testfiles/CGAL_CFG_NO_WARNING_CPP_DIRECTIVE_BUG.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/config/testfiles/CGAL_CFG_NUMERIC_LIMITS_BUG.cpp b/Installation/config/testfiles/CGAL_CFG_NUMERIC_LIMITS_BUG.cpp index ac064187321..2693c5d2d03 100644 --- a/Installation/config/testfiles/CGAL_CFG_NUMERIC_LIMITS_BUG.cpp +++ b/Installation/config/testfiles/CGAL_CFG_NUMERIC_LIMITS_BUG.cpp @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/config/testfiles/CGAL_CFG_OUTOFLINE_MEMBER_DEFINITION_BUG.cpp b/Installation/config/testfiles/CGAL_CFG_OUTOFLINE_MEMBER_DEFINITION_BUG.cpp index b7f2389e6ba..e6cc622863b 100644 --- a/Installation/config/testfiles/CGAL_CFG_OUTOFLINE_MEMBER_DEFINITION_BUG.cpp +++ b/Installation/config/testfiles/CGAL_CFG_OUTOFLINE_MEMBER_DEFINITION_BUG.cpp @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/config/testfiles/CGAL_CFG_TEMPLATE_IN_DEFAULT_PARAMETER_BUG.cpp b/Installation/config/testfiles/CGAL_CFG_TEMPLATE_IN_DEFAULT_PARAMETER_BUG.cpp index ce95a66a876..719fc3bbcb4 100644 --- a/Installation/config/testfiles/CGAL_CFG_TEMPLATE_IN_DEFAULT_PARAMETER_BUG.cpp +++ b/Installation/config/testfiles/CGAL_CFG_TEMPLATE_IN_DEFAULT_PARAMETER_BUG.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/config/testfiles/CGAL_CFG_TYPENAME_BEFORE_DEFAULT_ARGUMENT_BUG.cpp b/Installation/config/testfiles/CGAL_CFG_TYPENAME_BEFORE_DEFAULT_ARGUMENT_BUG.cpp index 4d10dd4c9b7..b54acb302f8 100644 --- a/Installation/config/testfiles/CGAL_CFG_TYPENAME_BEFORE_DEFAULT_ARGUMENT_BUG.cpp +++ b/Installation/config/testfiles/CGAL_CFG_TYPENAME_BEFORE_DEFAULT_ARGUMENT_BUG.cpp @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/config/testfiles/CGAL_CFG_USING_BASE_MEMBER_BUG_2.cpp b/Installation/config/testfiles/CGAL_CFG_USING_BASE_MEMBER_BUG_2.cpp index 682aa8a88f5..2e21ea0b174 100644 --- a/Installation/config/testfiles/CGAL_CFG_USING_BASE_MEMBER_BUG_2.cpp +++ b/Installation/config/testfiles/CGAL_CFG_USING_BASE_MEMBER_BUG_2.cpp @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/config/version.h.in b/Installation/config/version.h.in index 6af7c1fda68..6d7a51b1291 100644 --- a/Installation/config/version.h.in +++ b/Installation/config/version.h.in @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/include/CGAL/auto_link/CGAL.h b/Installation/include/CGAL/auto_link/CGAL.h index 83420f6686c..eb5c1af74d6 100644 --- a/Installation/include/CGAL/auto_link/CGAL.h +++ b/Installation/include/CGAL/auto_link/CGAL.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/include/CGAL/auto_link/CGALQt3.h b/Installation/include/CGAL/auto_link/CGALQt3.h index 44ffa76b618..1e24e3b91da 100644 --- a/Installation/include/CGAL/auto_link/CGALQt3.h +++ b/Installation/include/CGAL/auto_link/CGALQt3.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/include/CGAL/auto_link/CORE.h b/Installation/include/CGAL/auto_link/CORE.h index 0c4ebfef034..41d92ae009e 100644 --- a/Installation/include/CGAL/auto_link/CORE.h +++ b/Installation/include/CGAL/auto_link/CORE.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/include/CGAL/auto_link/GMP.h b/Installation/include/CGAL/auto_link/GMP.h index 98dc181cb3d..b4b06770e68 100644 --- a/Installation/include/CGAL/auto_link/GMP.h +++ b/Installation/include/CGAL/auto_link/GMP.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/include/CGAL/auto_link/ImageIO.h b/Installation/include/CGAL/auto_link/ImageIO.h index 5676dd0b2d1..617f5903f59 100644 --- a/Installation/include/CGAL/auto_link/ImageIO.h +++ b/Installation/include/CGAL/auto_link/ImageIO.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/include/CGAL/auto_link/LAPACK.h b/Installation/include/CGAL/auto_link/LAPACK.h index 583575538b4..a19b0447640 100644 --- a/Installation/include/CGAL/auto_link/LAPACK.h +++ b/Installation/include/CGAL/auto_link/LAPACK.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/include/CGAL/auto_link/MPFR.h b/Installation/include/CGAL/auto_link/MPFR.h index acbacff4d6e..b3e8c3fbd2b 100644 --- a/Installation/include/CGAL/auto_link/MPFR.h +++ b/Installation/include/CGAL/auto_link/MPFR.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/include/CGAL/auto_link/TAUCS.h b/Installation/include/CGAL/auto_link/TAUCS.h index edb9ed50160..3b615889098 100644 --- a/Installation/include/CGAL/auto_link/TAUCS.h +++ b/Installation/include/CGAL/auto_link/TAUCS.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/include/CGAL/auto_link/auto_link.h b/Installation/include/CGAL/auto_link/auto_link.h index fac5f952a66..680688e58da 100644 --- a/Installation/include/CGAL/auto_link/auto_link.h +++ b/Installation/include/CGAL/auto_link/auto_link.h @@ -12,8 +12,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/include/CGAL/config.h b/Installation/include/CGAL/config.h index cf0de8abac4..23e42aab9a9 100644 --- a/Installation/include/CGAL/config.h +++ b/Installation/include/CGAL/config.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/include/CGAL/export.h b/Installation/include/CGAL/export.h index fb13a88f8cb..cee06d9e20f 100755 --- a/Installation/include/CGAL/export.h +++ b/Installation/include/CGAL/export.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/include/CGAL/gl.h b/Installation/include/CGAL/gl.h index add436b5b77..b15dad980b7 100644 --- a/Installation/include/CGAL/gl.h +++ b/Installation/include/CGAL/gl.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/include/CGAL/glu.h b/Installation/include/CGAL/glu.h index 9449e2aa5a3..85b6e602dc2 100644 --- a/Installation/include/CGAL/glu.h +++ b/Installation/include/CGAL/glu.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/include/CGAL/internal/deprecation_warning.h b/Installation/include/CGAL/internal/deprecation_warning.h index 614057e9c6f..0a8872ea2b8 100644 --- a/Installation/include/CGAL/internal/deprecation_warning.h +++ b/Installation/include/CGAL/internal/deprecation_warning.h @@ -6,8 +6,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Installation/include/CGAL/internal/gcc_cpp0x.h b/Installation/include/CGAL/internal/gcc_cpp0x.h index 5a5e0ccade6..040793d8f65 100644 --- a/Installation/include/CGAL/internal/gcc_cpp0x.h +++ b/Installation/include/CGAL/internal/gcc_cpp0x.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/include/CGAL/version.h b/Installation/include/CGAL/version.h index 01b21182548..5535c766d53 100644 --- a/Installation/include/CGAL/version.h +++ b/Installation/include/CGAL/version.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_2/include/CGAL/Bbox_2_Line_2_intersection.h b/Intersections_2/include/CGAL/Bbox_2_Line_2_intersection.h index 5d0204680d6..02503f3c08d 100644 --- a/Intersections_2/include/CGAL/Bbox_2_Line_2_intersection.h +++ b/Intersections_2/include/CGAL/Bbox_2_Line_2_intersection.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_2/include/CGAL/Bbox_2_Ray_2_intersection.h b/Intersections_2/include/CGAL/Bbox_2_Ray_2_intersection.h index f7afd83fb51..5b79b6021da 100644 --- a/Intersections_2/include/CGAL/Bbox_2_Ray_2_intersection.h +++ b/Intersections_2/include/CGAL/Bbox_2_Ray_2_intersection.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_2/include/CGAL/Bbox_2_intersection.h b/Intersections_2/include/CGAL/Bbox_2_intersection.h index 44204f9da2f..ee73f87e110 100644 --- a/Intersections_2/include/CGAL/Bbox_2_intersection.h +++ b/Intersections_2/include/CGAL/Bbox_2_intersection.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_2/include/CGAL/Circle_2_Circle_2_intersection.h b/Intersections_2/include/CGAL/Circle_2_Circle_2_intersection.h index 0d44cfe0466..363b52a09a4 100644 --- a/Intersections_2/include/CGAL/Circle_2_Circle_2_intersection.h +++ b/Intersections_2/include/CGAL/Circle_2_Circle_2_intersection.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_2/include/CGAL/Circle_2_Line_2_intersection.h b/Intersections_2/include/CGAL/Circle_2_Line_2_intersection.h index eb6187178dd..ebd05acd61d 100644 --- a/Intersections_2/include/CGAL/Circle_2_Line_2_intersection.h +++ b/Intersections_2/include/CGAL/Circle_2_Line_2_intersection.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_2/include/CGAL/Intersections_2/Triangle_2_Triangle_2_intersection_impl.h b/Intersections_2/include/CGAL/Intersections_2/Triangle_2_Triangle_2_intersection_impl.h index 1c1e7ea6e3c..89bcc1a8039 100644 --- a/Intersections_2/include/CGAL/Intersections_2/Triangle_2_Triangle_2_intersection_impl.h +++ b/Intersections_2/include/CGAL/Intersections_2/Triangle_2_Triangle_2_intersection_impl.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_2/include/CGAL/Iso_rectangle_2_Iso_rectangle_2_intersection.h b/Intersections_2/include/CGAL/Iso_rectangle_2_Iso_rectangle_2_intersection.h index 7a550c1c18f..ee0594f56bb 100644 --- a/Intersections_2/include/CGAL/Iso_rectangle_2_Iso_rectangle_2_intersection.h +++ b/Intersections_2/include/CGAL/Iso_rectangle_2_Iso_rectangle_2_intersection.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_2/include/CGAL/Iso_rectangle_2_Line_2_intersection.h b/Intersections_2/include/CGAL/Iso_rectangle_2_Line_2_intersection.h index 0fcf1d8e5cb..024af411684 100644 --- a/Intersections_2/include/CGAL/Iso_rectangle_2_Line_2_intersection.h +++ b/Intersections_2/include/CGAL/Iso_rectangle_2_Line_2_intersection.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_2/include/CGAL/Iso_rectangle_2_Point_2_intersection.h b/Intersections_2/include/CGAL/Iso_rectangle_2_Point_2_intersection.h index cb262d2368d..c6c1f53585a 100644 --- a/Intersections_2/include/CGAL/Iso_rectangle_2_Point_2_intersection.h +++ b/Intersections_2/include/CGAL/Iso_rectangle_2_Point_2_intersection.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_2/include/CGAL/Iso_rectangle_2_Ray_2_intersection.h b/Intersections_2/include/CGAL/Iso_rectangle_2_Ray_2_intersection.h index ebf9ceeec45..20dd8cd47fe 100644 --- a/Intersections_2/include/CGAL/Iso_rectangle_2_Ray_2_intersection.h +++ b/Intersections_2/include/CGAL/Iso_rectangle_2_Ray_2_intersection.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_2/include/CGAL/Iso_rectangle_2_Segment_2_intersection.h b/Intersections_2/include/CGAL/Iso_rectangle_2_Segment_2_intersection.h index f04c51e37da..a0c8049cd3c 100644 --- a/Intersections_2/include/CGAL/Iso_rectangle_2_Segment_2_intersection.h +++ b/Intersections_2/include/CGAL/Iso_rectangle_2_Segment_2_intersection.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_2/include/CGAL/Line_2_Bbox_2_intersection.h b/Intersections_2/include/CGAL/Line_2_Bbox_2_intersection.h index 9c054f3e62c..1ff9d8c8483 100644 --- a/Intersections_2/include/CGAL/Line_2_Bbox_2_intersection.h +++ b/Intersections_2/include/CGAL/Line_2_Bbox_2_intersection.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_2/include/CGAL/Line_2_Iso_rectangle_2_intersection.h b/Intersections_2/include/CGAL/Line_2_Iso_rectangle_2_intersection.h index bf57d087332..dd1a40dfae5 100644 --- a/Intersections_2/include/CGAL/Line_2_Iso_rectangle_2_intersection.h +++ b/Intersections_2/include/CGAL/Line_2_Iso_rectangle_2_intersection.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_2/include/CGAL/Line_2_Line_2_intersection.h b/Intersections_2/include/CGAL/Line_2_Line_2_intersection.h index a55f9fbcf20..af14ef07fb7 100644 --- a/Intersections_2/include/CGAL/Line_2_Line_2_intersection.h +++ b/Intersections_2/include/CGAL/Line_2_Line_2_intersection.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_2/include/CGAL/Line_2_Point_2_intersection.h b/Intersections_2/include/CGAL/Line_2_Point_2_intersection.h index 46c96cf465e..c13bea8421b 100644 --- a/Intersections_2/include/CGAL/Line_2_Point_2_intersection.h +++ b/Intersections_2/include/CGAL/Line_2_Point_2_intersection.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_2/include/CGAL/Line_2_Ray_2_intersection.h b/Intersections_2/include/CGAL/Line_2_Ray_2_intersection.h index 94000032318..bdb129fe65a 100644 --- a/Intersections_2/include/CGAL/Line_2_Ray_2_intersection.h +++ b/Intersections_2/include/CGAL/Line_2_Ray_2_intersection.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_2/include/CGAL/Line_2_Segment_2_intersection.h b/Intersections_2/include/CGAL/Line_2_Segment_2_intersection.h index a156c6ea064..7bcc5403463 100644 --- a/Intersections_2/include/CGAL/Line_2_Segment_2_intersection.h +++ b/Intersections_2/include/CGAL/Line_2_Segment_2_intersection.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_2/include/CGAL/Line_2_Triangle_2_intersection.h b/Intersections_2/include/CGAL/Line_2_Triangle_2_intersection.h index 5f1a1358b1d..5c50774a2ce 100644 --- a/Intersections_2/include/CGAL/Line_2_Triangle_2_intersection.h +++ b/Intersections_2/include/CGAL/Line_2_Triangle_2_intersection.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_2/include/CGAL/Point_2_Iso_rectangle_2_intersection.h b/Intersections_2/include/CGAL/Point_2_Iso_rectangle_2_intersection.h index 221c6e746e1..115374cdd1b 100644 --- a/Intersections_2/include/CGAL/Point_2_Iso_rectangle_2_intersection.h +++ b/Intersections_2/include/CGAL/Point_2_Iso_rectangle_2_intersection.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_2/include/CGAL/Point_2_Line_2_intersection.h b/Intersections_2/include/CGAL/Point_2_Line_2_intersection.h index 5ecdc5d6478..55b94b38620 100644 --- a/Intersections_2/include/CGAL/Point_2_Line_2_intersection.h +++ b/Intersections_2/include/CGAL/Point_2_Line_2_intersection.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_2/include/CGAL/Point_2_Point_2_intersection.h b/Intersections_2/include/CGAL/Point_2_Point_2_intersection.h index c5e543bec63..305bf7b9a1a 100644 --- a/Intersections_2/include/CGAL/Point_2_Point_2_intersection.h +++ b/Intersections_2/include/CGAL/Point_2_Point_2_intersection.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_2/include/CGAL/Point_2_Ray_2_intersection.h b/Intersections_2/include/CGAL/Point_2_Ray_2_intersection.h index a3623a1980b..90a70320bd2 100644 --- a/Intersections_2/include/CGAL/Point_2_Ray_2_intersection.h +++ b/Intersections_2/include/CGAL/Point_2_Ray_2_intersection.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_2/include/CGAL/Point_2_Segment_2_intersection.h b/Intersections_2/include/CGAL/Point_2_Segment_2_intersection.h index 43c3eeca256..78842e28feb 100644 --- a/Intersections_2/include/CGAL/Point_2_Segment_2_intersection.h +++ b/Intersections_2/include/CGAL/Point_2_Segment_2_intersection.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_2/include/CGAL/Point_2_Triangle_2_intersection.h b/Intersections_2/include/CGAL/Point_2_Triangle_2_intersection.h index d8efa7279bb..4ae6e78d511 100644 --- a/Intersections_2/include/CGAL/Point_2_Triangle_2_intersection.h +++ b/Intersections_2/include/CGAL/Point_2_Triangle_2_intersection.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_2/include/CGAL/Ray_2_Bbox_2_intersection.h b/Intersections_2/include/CGAL/Ray_2_Bbox_2_intersection.h index aea1bd5cd33..13323e874ba 100644 --- a/Intersections_2/include/CGAL/Ray_2_Bbox_2_intersection.h +++ b/Intersections_2/include/CGAL/Ray_2_Bbox_2_intersection.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_2/include/CGAL/Ray_2_Iso_rectangle_2_intersection.h b/Intersections_2/include/CGAL/Ray_2_Iso_rectangle_2_intersection.h index af91f568b7f..99296c5db00 100644 --- a/Intersections_2/include/CGAL/Ray_2_Iso_rectangle_2_intersection.h +++ b/Intersections_2/include/CGAL/Ray_2_Iso_rectangle_2_intersection.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_2/include/CGAL/Ray_2_Line_2_intersection.h b/Intersections_2/include/CGAL/Ray_2_Line_2_intersection.h index 9c29ca119c7..2019284cf9a 100644 --- a/Intersections_2/include/CGAL/Ray_2_Line_2_intersection.h +++ b/Intersections_2/include/CGAL/Ray_2_Line_2_intersection.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_2/include/CGAL/Ray_2_Point_2_intersection.h b/Intersections_2/include/CGAL/Ray_2_Point_2_intersection.h index 742232b883a..6a8d3b81e8c 100644 --- a/Intersections_2/include/CGAL/Ray_2_Point_2_intersection.h +++ b/Intersections_2/include/CGAL/Ray_2_Point_2_intersection.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_2/include/CGAL/Ray_2_Ray_2_intersection.h b/Intersections_2/include/CGAL/Ray_2_Ray_2_intersection.h index 29b3c6f7a49..506b4eed36c 100644 --- a/Intersections_2/include/CGAL/Ray_2_Ray_2_intersection.h +++ b/Intersections_2/include/CGAL/Ray_2_Ray_2_intersection.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_2/include/CGAL/Ray_2_Segment_2_intersection.h b/Intersections_2/include/CGAL/Ray_2_Segment_2_intersection.h index 23d94f26109..373284bba32 100644 --- a/Intersections_2/include/CGAL/Ray_2_Segment_2_intersection.h +++ b/Intersections_2/include/CGAL/Ray_2_Segment_2_intersection.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_2/include/CGAL/Ray_2_Triangle_2_intersection.h b/Intersections_2/include/CGAL/Ray_2_Triangle_2_intersection.h index 9933eb55c71..441aa9fb9f7 100644 --- a/Intersections_2/include/CGAL/Ray_2_Triangle_2_intersection.h +++ b/Intersections_2/include/CGAL/Ray_2_Triangle_2_intersection.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_2/include/CGAL/Segment_2_Iso_rectangle_2_intersection.h b/Intersections_2/include/CGAL/Segment_2_Iso_rectangle_2_intersection.h index b2564308fd4..d75f0a7b43f 100644 --- a/Intersections_2/include/CGAL/Segment_2_Iso_rectangle_2_intersection.h +++ b/Intersections_2/include/CGAL/Segment_2_Iso_rectangle_2_intersection.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_2/include/CGAL/Segment_2_Line_2_intersection.h b/Intersections_2/include/CGAL/Segment_2_Line_2_intersection.h index 4ba184fd94d..aba83bec9dc 100644 --- a/Intersections_2/include/CGAL/Segment_2_Line_2_intersection.h +++ b/Intersections_2/include/CGAL/Segment_2_Line_2_intersection.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_2/include/CGAL/Segment_2_Point_2_intersection.h b/Intersections_2/include/CGAL/Segment_2_Point_2_intersection.h index 4934aa6014e..1eb34162644 100644 --- a/Intersections_2/include/CGAL/Segment_2_Point_2_intersection.h +++ b/Intersections_2/include/CGAL/Segment_2_Point_2_intersection.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_2/include/CGAL/Segment_2_Ray_2_intersection.h b/Intersections_2/include/CGAL/Segment_2_Ray_2_intersection.h index 0f1454c19ab..36121e3dae2 100644 --- a/Intersections_2/include/CGAL/Segment_2_Ray_2_intersection.h +++ b/Intersections_2/include/CGAL/Segment_2_Ray_2_intersection.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_2/include/CGAL/Segment_2_Segment_2_intersection.h b/Intersections_2/include/CGAL/Segment_2_Segment_2_intersection.h index 092c3a462be..7acebb5a6b0 100644 --- a/Intersections_2/include/CGAL/Segment_2_Segment_2_intersection.h +++ b/Intersections_2/include/CGAL/Segment_2_Segment_2_intersection.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_2/include/CGAL/Segment_2_Triangle_2_intersection.h b/Intersections_2/include/CGAL/Segment_2_Triangle_2_intersection.h index f5a3683f5c8..d2da60d9d8e 100644 --- a/Intersections_2/include/CGAL/Segment_2_Triangle_2_intersection.h +++ b/Intersections_2/include/CGAL/Segment_2_Triangle_2_intersection.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_2/include/CGAL/Straight_2.h b/Intersections_2/include/CGAL/Straight_2.h index c37bda21faf..fdc1746ea31 100644 --- a/Intersections_2/include/CGAL/Straight_2.h +++ b/Intersections_2/include/CGAL/Straight_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_2/include/CGAL/Triangle_2_Iso_rectangle_2_intersection.h b/Intersections_2/include/CGAL/Triangle_2_Iso_rectangle_2_intersection.h index 753ab7cf871..4cc9b6a4ba0 100644 --- a/Intersections_2/include/CGAL/Triangle_2_Iso_rectangle_2_intersection.h +++ b/Intersections_2/include/CGAL/Triangle_2_Iso_rectangle_2_intersection.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_2/include/CGAL/Triangle_2_Line_2_intersection.h b/Intersections_2/include/CGAL/Triangle_2_Line_2_intersection.h index bb199ca268f..6b14646a11b 100644 --- a/Intersections_2/include/CGAL/Triangle_2_Line_2_intersection.h +++ b/Intersections_2/include/CGAL/Triangle_2_Line_2_intersection.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_2/include/CGAL/Triangle_2_Point_2_intersection.h b/Intersections_2/include/CGAL/Triangle_2_Point_2_intersection.h index a42f658f9f2..77b95d68962 100644 --- a/Intersections_2/include/CGAL/Triangle_2_Point_2_intersection.h +++ b/Intersections_2/include/CGAL/Triangle_2_Point_2_intersection.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_2/include/CGAL/Triangle_2_Ray_2_intersection.h b/Intersections_2/include/CGAL/Triangle_2_Ray_2_intersection.h index bd45bdbfbf6..3c5ab143480 100644 --- a/Intersections_2/include/CGAL/Triangle_2_Ray_2_intersection.h +++ b/Intersections_2/include/CGAL/Triangle_2_Ray_2_intersection.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_2/include/CGAL/Triangle_2_Segment_2_intersection.h b/Intersections_2/include/CGAL/Triangle_2_Segment_2_intersection.h index d6d0e048414..0b7084f3363 100644 --- a/Intersections_2/include/CGAL/Triangle_2_Segment_2_intersection.h +++ b/Intersections_2/include/CGAL/Triangle_2_Segment_2_intersection.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_2/include/CGAL/Triangle_2_Triangle_2_do_intersect.h b/Intersections_2/include/CGAL/Triangle_2_Triangle_2_do_intersect.h index b0ede9e0390..2ba8d047649 100644 --- a/Intersections_2/include/CGAL/Triangle_2_Triangle_2_do_intersect.h +++ b/Intersections_2/include/CGAL/Triangle_2_Triangle_2_do_intersect.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_2/include/CGAL/Triangle_2_Triangle_2_intersection.h b/Intersections_2/include/CGAL/Triangle_2_Triangle_2_intersection.h index 936677aa0f2..eeb67ed716d 100644 --- a/Intersections_2/include/CGAL/Triangle_2_Triangle_2_intersection.h +++ b/Intersections_2/include/CGAL/Triangle_2_Triangle_2_intersection.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_2/include/CGAL/intersection_2.h b/Intersections_2/include/CGAL/intersection_2.h index 4dac03332e9..7379cbfd4fc 100644 --- a/Intersections_2/include/CGAL/intersection_2.h +++ b/Intersections_2/include/CGAL/intersection_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_2/include/CGAL/intersection_2_1.h b/Intersections_2/include/CGAL/intersection_2_1.h index 9a04295ca2b..b9f33f5cac4 100644 --- a/Intersections_2/include/CGAL/intersection_2_1.h +++ b/Intersections_2/include/CGAL/intersection_2_1.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_2/include/CGAL/intersection_2_2.h b/Intersections_2/include/CGAL/intersection_2_2.h index 04ed498ebd1..470c966d748 100644 --- a/Intersections_2/include/CGAL/intersection_2_2.h +++ b/Intersections_2/include/CGAL/intersection_2_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_2/include/CGAL/intersection_2_3.h b/Intersections_2/include/CGAL/intersection_2_3.h index f5de40aacc9..1aeebcb550f 100644 --- a/Intersections_2/include/CGAL/intersection_2_3.h +++ b/Intersections_2/include/CGAL/intersection_2_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_2/src/CGAL/Bbox_2_intersections.cpp b/Intersections_2/src/CGAL/Bbox_2_intersections.cpp index f256ad430e9..baa4bf5b4ac 100644 --- a/Intersections_2/src/CGAL/Bbox_2_intersections.cpp +++ b/Intersections_2/src/CGAL/Bbox_2_intersections.cpp @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_3/include/CGAL/Intersections_3/intersection_3_1_impl.h b/Intersections_3/include/CGAL/Intersections_3/intersection_3_1_impl.h index 3031d312a9b..b420e87cd7f 100644 --- a/Intersections_3/include/CGAL/Intersections_3/intersection_3_1_impl.h +++ b/Intersections_3/include/CGAL/Intersections_3/intersection_3_1_impl.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_3/include/CGAL/Triangle_3_Line_3_do_intersect.h b/Intersections_3/include/CGAL/Triangle_3_Line_3_do_intersect.h index a63e2a40e31..fa794036e5e 100644 --- a/Intersections_3/include/CGAL/Triangle_3_Line_3_do_intersect.h +++ b/Intersections_3/include/CGAL/Triangle_3_Line_3_do_intersect.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_3/include/CGAL/Triangle_3_Plane_3_do_intersect.h b/Intersections_3/include/CGAL/Triangle_3_Plane_3_do_intersect.h index d86481ee042..43353faa9f5 100644 --- a/Intersections_3/include/CGAL/Triangle_3_Plane_3_do_intersect.h +++ b/Intersections_3/include/CGAL/Triangle_3_Plane_3_do_intersect.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_3/include/CGAL/Triangle_3_Point_3_do_intersect.h b/Intersections_3/include/CGAL/Triangle_3_Point_3_do_intersect.h index 9b89ca21269..105b91b0a25 100644 --- a/Intersections_3/include/CGAL/Triangle_3_Point_3_do_intersect.h +++ b/Intersections_3/include/CGAL/Triangle_3_Point_3_do_intersect.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_3/include/CGAL/Triangle_3_Ray_3_do_intersect.h b/Intersections_3/include/CGAL/Triangle_3_Ray_3_do_intersect.h index 19b69d8ca35..a9c6660d874 100644 --- a/Intersections_3/include/CGAL/Triangle_3_Ray_3_do_intersect.h +++ b/Intersections_3/include/CGAL/Triangle_3_Ray_3_do_intersect.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_3/include/CGAL/Triangle_3_Segment_3_do_intersect.h b/Intersections_3/include/CGAL/Triangle_3_Segment_3_do_intersect.h index bd101ba6cf1..6e7b057536c 100644 --- a/Intersections_3/include/CGAL/Triangle_3_Segment_3_do_intersect.h +++ b/Intersections_3/include/CGAL/Triangle_3_Segment_3_do_intersect.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_3/include/CGAL/Triangle_3_Tetrahedron_3_do_intersect.h b/Intersections_3/include/CGAL/Triangle_3_Tetrahedron_3_do_intersect.h index d2d2702b320..bbec80b86e5 100644 --- a/Intersections_3/include/CGAL/Triangle_3_Tetrahedron_3_do_intersect.h +++ b/Intersections_3/include/CGAL/Triangle_3_Tetrahedron_3_do_intersect.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_3/include/CGAL/Triangle_3_Triangle_3_do_intersect.h b/Intersections_3/include/CGAL/Triangle_3_Triangle_3_do_intersect.h index 36d86962dac..1acec1725a4 100644 --- a/Intersections_3/include/CGAL/Triangle_3_Triangle_3_do_intersect.h +++ b/Intersections_3/include/CGAL/Triangle_3_Triangle_3_do_intersect.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_3/include/CGAL/Triangle_3_Triangle_3_intersection.h b/Intersections_3/include/CGAL/Triangle_3_Triangle_3_intersection.h index 05958fca41e..0f0325e10fb 100644 --- a/Intersections_3/include/CGAL/Triangle_3_Triangle_3_intersection.h +++ b/Intersections_3/include/CGAL/Triangle_3_Triangle_3_intersection.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_3/include/CGAL/bbox_intersection_3.h b/Intersections_3/include/CGAL/bbox_intersection_3.h index aac56e7b1ce..dca78ed22f8 100644 --- a/Intersections_3/include/CGAL/bbox_intersection_3.h +++ b/Intersections_3/include/CGAL/bbox_intersection_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_3/include/CGAL/internal/Intersections_3/Bbox_3_Bbox_3_do_intersect.h b/Intersections_3/include/CGAL/internal/Intersections_3/Bbox_3_Bbox_3_do_intersect.h index 2f60cce56af..0b080205dc2 100644 --- a/Intersections_3/include/CGAL/internal/Intersections_3/Bbox_3_Bbox_3_do_intersect.h +++ b/Intersections_3/include/CGAL/internal/Intersections_3/Bbox_3_Bbox_3_do_intersect.h @@ -5,8 +5,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_3/include/CGAL/internal/Intersections_3/Bbox_3_Line_3_do_intersect.h b/Intersections_3/include/CGAL/internal/Intersections_3/Bbox_3_Line_3_do_intersect.h index 78fa82752b5..3353043189d 100644 --- a/Intersections_3/include/CGAL/internal/Intersections_3/Bbox_3_Line_3_do_intersect.h +++ b/Intersections_3/include/CGAL/internal/Intersections_3/Bbox_3_Line_3_do_intersect.h @@ -4,8 +4,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_3/include/CGAL/internal/Intersections_3/Bbox_3_Plane_3_do_intersect.h b/Intersections_3/include/CGAL/internal/Intersections_3/Bbox_3_Plane_3_do_intersect.h index f081ac1debe..4c6b3fd00ff 100644 --- a/Intersections_3/include/CGAL/internal/Intersections_3/Bbox_3_Plane_3_do_intersect.h +++ b/Intersections_3/include/CGAL/internal/Intersections_3/Bbox_3_Plane_3_do_intersect.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_3/include/CGAL/internal/Intersections_3/Bbox_3_Ray_3_do_intersect.h b/Intersections_3/include/CGAL/internal/Intersections_3/Bbox_3_Ray_3_do_intersect.h index 32a32b97ad2..970c484f5ff 100644 --- a/Intersections_3/include/CGAL/internal/Intersections_3/Bbox_3_Ray_3_do_intersect.h +++ b/Intersections_3/include/CGAL/internal/Intersections_3/Bbox_3_Ray_3_do_intersect.h @@ -4,8 +4,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_3/include/CGAL/internal/Intersections_3/Bbox_3_Segment_3_do_intersect.h b/Intersections_3/include/CGAL/internal/Intersections_3/Bbox_3_Segment_3_do_intersect.h index afbd63bc13e..43e6052e9ad 100644 --- a/Intersections_3/include/CGAL/internal/Intersections_3/Bbox_3_Segment_3_do_intersect.h +++ b/Intersections_3/include/CGAL/internal/Intersections_3/Bbox_3_Segment_3_do_intersect.h @@ -4,8 +4,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_3/include/CGAL/internal/Intersections_3/Bbox_3_Sphere_3_do_intersect.h b/Intersections_3/include/CGAL/internal/Intersections_3/Bbox_3_Sphere_3_do_intersect.h index 07b80d97313..e77a6afb6b8 100644 --- a/Intersections_3/include/CGAL/internal/Intersections_3/Bbox_3_Sphere_3_do_intersect.h +++ b/Intersections_3/include/CGAL/internal/Intersections_3/Bbox_3_Sphere_3_do_intersect.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_3/include/CGAL/internal/Intersections_3/Bbox_3_Triangle_3_do_intersect.h b/Intersections_3/include/CGAL/internal/Intersections_3/Bbox_3_Triangle_3_do_intersect.h index f7fca0350dc..2cc524b57ee 100644 --- a/Intersections_3/include/CGAL/internal/Intersections_3/Bbox_3_Triangle_3_do_intersect.h +++ b/Intersections_3/include/CGAL/internal/Intersections_3/Bbox_3_Triangle_3_do_intersect.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_3/include/CGAL/internal/Intersections_3/Triangle_3_Line_3_intersection.h b/Intersections_3/include/CGAL/internal/Intersections_3/Triangle_3_Line_3_intersection.h index ac4fa236730..b2de8c5a7fb 100644 --- a/Intersections_3/include/CGAL/internal/Intersections_3/Triangle_3_Line_3_intersection.h +++ b/Intersections_3/include/CGAL/internal/Intersections_3/Triangle_3_Line_3_intersection.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_3/include/CGAL/internal/Intersections_3/Triangle_3_Ray_3_intersection.h b/Intersections_3/include/CGAL/internal/Intersections_3/Triangle_3_Ray_3_intersection.h index 65c22a4668c..11f08b4fd8b 100644 --- a/Intersections_3/include/CGAL/internal/Intersections_3/Triangle_3_Ray_3_intersection.h +++ b/Intersections_3/include/CGAL/internal/Intersections_3/Triangle_3_Ray_3_intersection.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_3/include/CGAL/internal/Intersections_3/Triangle_3_Segment_3_intersection.h b/Intersections_3/include/CGAL/internal/Intersections_3/Triangle_3_Segment_3_intersection.h index a0bd392d1a6..86c83351dfe 100644 --- a/Intersections_3/include/CGAL/internal/Intersections_3/Triangle_3_Segment_3_intersection.h +++ b/Intersections_3/include/CGAL/internal/Intersections_3/Triangle_3_Segment_3_intersection.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_3/include/CGAL/intersection_3.h b/Intersections_3/include/CGAL/intersection_3.h index f39c8d33041..329456441d9 100644 --- a/Intersections_3/include/CGAL/intersection_3.h +++ b/Intersections_3/include/CGAL/intersection_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_3/include/CGAL/intersection_3_1.h b/Intersections_3/include/CGAL/intersection_3_1.h index bfabfb3e900..ea2a023d12a 100644 --- a/Intersections_3/include/CGAL/intersection_3_1.h +++ b/Intersections_3/include/CGAL/intersection_3_1.h @@ -8,8 +8,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_3/include/CGAL/intersections.h b/Intersections_3/include/CGAL/intersections.h index 2266d8ca17a..383e20e77cc 100644 --- a/Intersections_3/include/CGAL/intersections.h +++ b/Intersections_3/include/CGAL/intersections.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_3/test/Intersections_3/bbox_other_do_intersect_test.cpp b/Intersections_3/test/Intersections_3/bbox_other_do_intersect_test.cpp index 1e182071d0d..7e0f2b03fb2 100644 --- a/Intersections_3/test/Intersections_3/bbox_other_do_intersect_test.cpp +++ b/Intersections_3/test/Intersections_3/bbox_other_do_intersect_test.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Intersections_3/test/Intersections_3/triangle_other_intersection_test.cpp b/Intersections_3/test/Intersections_3/triangle_other_intersection_test.cpp index d723a38d796..57036f2e574 100644 --- a/Intersections_3/test/Intersections_3/triangle_other_intersection_test.cpp +++ b/Intersections_3/test/Intersections_3/triangle_other_intersection_test.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Interval_support/include/CGAL/Bigfloat_interval_traits.h b/Interval_support/include/CGAL/Bigfloat_interval_traits.h index 1827d6a0755..a8a89007fa2 100644 --- a/Interval_support/include/CGAL/Bigfloat_interval_traits.h +++ b/Interval_support/include/CGAL/Bigfloat_interval_traits.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Interval_support/include/CGAL/Interval_traits.h b/Interval_support/include/CGAL/Interval_traits.h index c5d1f911003..654ed8b51a3 100644 --- a/Interval_support/include/CGAL/Interval_traits.h +++ b/Interval_support/include/CGAL/Interval_traits.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Interval_support/include/CGAL/Test/_test_bigfloat_interval_traits.h b/Interval_support/include/CGAL/Test/_test_bigfloat_interval_traits.h index 98e7b3e0166..d88a99e3730 100644 --- a/Interval_support/include/CGAL/Test/_test_bigfloat_interval_traits.h +++ b/Interval_support/include/CGAL/Test/_test_bigfloat_interval_traits.h @@ -4,8 +4,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Interval_support/include/CGAL/Test/_test_convert_to_bfi.h b/Interval_support/include/CGAL/Test/_test_convert_to_bfi.h index c51e37d05dd..cd47f47a9e9 100644 --- a/Interval_support/include/CGAL/Test/_test_convert_to_bfi.h +++ b/Interval_support/include/CGAL/Test/_test_convert_to_bfi.h @@ -4,8 +4,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Interval_support/include/CGAL/Test/_test_interval_traits.h b/Interval_support/include/CGAL/Test/_test_interval_traits.h index 12f7f9e482c..e23d2025fe4 100644 --- a/Interval_support/include/CGAL/Test/_test_interval_traits.h +++ b/Interval_support/include/CGAL/Test/_test_interval_traits.h @@ -4,8 +4,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Interval_support/include/CGAL/convert_to_bfi.h b/Interval_support/include/CGAL/convert_to_bfi.h index 3bc89bc5f06..8328075abc2 100644 --- a/Interval_support/include/CGAL/convert_to_bfi.h +++ b/Interval_support/include/CGAL/convert_to_bfi.h @@ -4,8 +4,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Inventor/include/CGAL/IO/Alpha_shape_3_VRML_2_ostream.h b/Inventor/include/CGAL/IO/Alpha_shape_3_VRML_2_ostream.h index 3d8b1476f9a..4efa18b988b 100644 --- a/Inventor/include/CGAL/IO/Alpha_shape_3_VRML_2_ostream.h +++ b/Inventor/include/CGAL/IO/Alpha_shape_3_VRML_2_ostream.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Inventor/include/CGAL/IO/Inventor_ostream.h b/Inventor/include/CGAL/IO/Inventor_ostream.h index e2648beeb1d..cbb765f2852 100644 --- a/Inventor/include/CGAL/IO/Inventor_ostream.h +++ b/Inventor/include/CGAL/IO/Inventor_ostream.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Inventor/include/CGAL/IO/VRML_1_ostream.h b/Inventor/include/CGAL/IO/VRML_1_ostream.h index 3771ee2a231..42401ede0eb 100644 --- a/Inventor/include/CGAL/IO/VRML_1_ostream.h +++ b/Inventor/include/CGAL/IO/VRML_1_ostream.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Inventor/include/CGAL/IO/VRML_2_ostream.h b/Inventor/include/CGAL/IO/VRML_2_ostream.h index 4c7942629ba..b52d34444c4 100644 --- a/Inventor/include/CGAL/IO/VRML_2_ostream.h +++ b/Inventor/include/CGAL/IO/VRML_2_ostream.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/Aff_transformation_2.h b/Kernel_23/include/CGAL/Aff_transformation_2.h index 3644ca93378..973b859d78d 100644 --- a/Kernel_23/include/CGAL/Aff_transformation_2.h +++ b/Kernel_23/include/CGAL/Aff_transformation_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/Aff_transformation_3.h b/Kernel_23/include/CGAL/Aff_transformation_3.h index a24b3319415..e8f3ddd4fc4 100644 --- a/Kernel_23/include/CGAL/Aff_transformation_3.h +++ b/Kernel_23/include/CGAL/Aff_transformation_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/Bbox_2.h b/Kernel_23/include/CGAL/Bbox_2.h index 774208c0dff..b5dd89035e3 100644 --- a/Kernel_23/include/CGAL/Bbox_2.h +++ b/Kernel_23/include/CGAL/Bbox_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/Bbox_3.h b/Kernel_23/include/CGAL/Bbox_3.h index b1016c2e0a9..dd4c9f70a60 100644 --- a/Kernel_23/include/CGAL/Bbox_3.h +++ b/Kernel_23/include/CGAL/Bbox_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/Circle_2.h b/Kernel_23/include/CGAL/Circle_2.h index 472ed55bd3b..6bfe2864d03 100644 --- a/Kernel_23/include/CGAL/Circle_2.h +++ b/Kernel_23/include/CGAL/Circle_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/Circle_3.h b/Kernel_23/include/CGAL/Circle_3.h index 82a7c7ff0f5..0f82025e592 100644 --- a/Kernel_23/include/CGAL/Circle_3.h +++ b/Kernel_23/include/CGAL/Circle_3.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/Dimension.h b/Kernel_23/include/CGAL/Dimension.h index debd7e4e4f7..aab513f36ae 100644 --- a/Kernel_23/include/CGAL/Dimension.h +++ b/Kernel_23/include/CGAL/Dimension.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/Direction_2.h b/Kernel_23/include/CGAL/Direction_2.h index 9b0ce7d5ebc..3ca857319ab 100644 --- a/Kernel_23/include/CGAL/Direction_2.h +++ b/Kernel_23/include/CGAL/Direction_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/Direction_3.h b/Kernel_23/include/CGAL/Direction_3.h index 5ad46664a35..1fb9410f8f1 100644 --- a/Kernel_23/include/CGAL/Direction_3.h +++ b/Kernel_23/include/CGAL/Direction_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/Enum_converter.h b/Kernel_23/include/CGAL/Enum_converter.h index 8c1e387ef1d..03a0c45f363 100644 --- a/Kernel_23/include/CGAL/Enum_converter.h +++ b/Kernel_23/include/CGAL/Enum_converter.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/Exact_predicates_exact_constructions_kernel.h b/Kernel_23/include/CGAL/Exact_predicates_exact_constructions_kernel.h index aca45ad22e1..87208dbe19b 100644 --- a/Kernel_23/include/CGAL/Exact_predicates_exact_constructions_kernel.h +++ b/Kernel_23/include/CGAL/Exact_predicates_exact_constructions_kernel.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/Exact_predicates_exact_constructions_kernel_with_sqrt.h b/Kernel_23/include/CGAL/Exact_predicates_exact_constructions_kernel_with_sqrt.h index 481e4b7ff4e..8c48a1daf44 100644 --- a/Kernel_23/include/CGAL/Exact_predicates_exact_constructions_kernel_with_sqrt.h +++ b/Kernel_23/include/CGAL/Exact_predicates_exact_constructions_kernel_with_sqrt.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/Exact_predicates_inexact_constructions_kernel.h b/Kernel_23/include/CGAL/Exact_predicates_inexact_constructions_kernel.h index 50cdd1dce63..2c5b5221aef 100644 --- a/Kernel_23/include/CGAL/Exact_predicates_inexact_constructions_kernel.h +++ b/Kernel_23/include/CGAL/Exact_predicates_inexact_constructions_kernel.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/Is_a_predicate.h b/Kernel_23/include/CGAL/Is_a_predicate.h index 0b8267f6733..8971c02f064 100644 --- a/Kernel_23/include/CGAL/Is_a_predicate.h +++ b/Kernel_23/include/CGAL/Is_a_predicate.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/Iso_cuboid_3.h b/Kernel_23/include/CGAL/Iso_cuboid_3.h index de7b8fd290d..95bb36bf89f 100644 --- a/Kernel_23/include/CGAL/Iso_cuboid_3.h +++ b/Kernel_23/include/CGAL/Iso_cuboid_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/Iso_rectangle_2.h b/Kernel_23/include/CGAL/Iso_rectangle_2.h index 6b22ad404b2..f13381a12e3 100644 --- a/Kernel_23/include/CGAL/Iso_rectangle_2.h +++ b/Kernel_23/include/CGAL/Iso_rectangle_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/Kernel/Dimension_utils.h b/Kernel_23/include/CGAL/Kernel/Dimension_utils.h index 173f2a351fc..cc34078b534 100644 --- a/Kernel_23/include/CGAL/Kernel/Dimension_utils.h +++ b/Kernel_23/include/CGAL/Kernel/Dimension_utils.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/Kernel/Return_base_tag.h b/Kernel_23/include/CGAL/Kernel/Return_base_tag.h index 515bf041530..9b2d4901307 100644 --- a/Kernel_23/include/CGAL/Kernel/Return_base_tag.h +++ b/Kernel_23/include/CGAL/Kernel/Return_base_tag.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/Kernel/Same_uncertainty.h b/Kernel_23/include/CGAL/Kernel/Same_uncertainty.h index 443af661246..744dd3abffb 100644 --- a/Kernel_23/include/CGAL/Kernel/Same_uncertainty.h +++ b/Kernel_23/include/CGAL/Kernel/Same_uncertainty.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/Kernel/Type_equality_wrapper.h b/Kernel_23/include/CGAL/Kernel/Type_equality_wrapper.h index c38c8374ebc..2ee66dc2691 100644 --- a/Kernel_23/include/CGAL/Kernel/Type_equality_wrapper.h +++ b/Kernel_23/include/CGAL/Kernel/Type_equality_wrapper.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/Kernel/Type_mapper.h b/Kernel_23/include/CGAL/Kernel/Type_mapper.h index be3bc8847fe..0fc8f6e7334 100644 --- a/Kernel_23/include/CGAL/Kernel/Type_mapper.h +++ b/Kernel_23/include/CGAL/Kernel/Type_mapper.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/Kernel/Wutils.h b/Kernel_23/include/CGAL/Kernel/Wutils.h index 74229c2bd4f..adcad69674a 100644 --- a/Kernel_23/include/CGAL/Kernel/Wutils.h +++ b/Kernel_23/include/CGAL/Kernel/Wutils.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/Kernel/function_objects.h b/Kernel_23/include/CGAL/Kernel/function_objects.h index b258f009298..b80d4045b50 100644 --- a/Kernel_23/include/CGAL/Kernel/function_objects.h +++ b/Kernel_23/include/CGAL/Kernel/function_objects.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/Kernel/global_functions.h b/Kernel_23/include/CGAL/Kernel/global_functions.h index 4b79e2691a6..e4e8544ea7b 100644 --- a/Kernel_23/include/CGAL/Kernel/global_functions.h +++ b/Kernel_23/include/CGAL/Kernel/global_functions.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/Kernel/global_functions_2.h b/Kernel_23/include/CGAL/Kernel/global_functions_2.h index e90d3d98b36..72256daf11d 100644 --- a/Kernel_23/include/CGAL/Kernel/global_functions_2.h +++ b/Kernel_23/include/CGAL/Kernel/global_functions_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/Kernel/global_functions_3.h b/Kernel_23/include/CGAL/Kernel/global_functions_3.h index 09e2e29a09f..8b6e725b527 100644 --- a/Kernel_23/include/CGAL/Kernel/global_functions_3.h +++ b/Kernel_23/include/CGAL/Kernel/global_functions_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/Kernel/global_functions_internal_2.h b/Kernel_23/include/CGAL/Kernel/global_functions_internal_2.h index f88019f86d7..126e359fca2 100644 --- a/Kernel_23/include/CGAL/Kernel/global_functions_internal_2.h +++ b/Kernel_23/include/CGAL/Kernel/global_functions_internal_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/Kernel/global_functions_internal_3.h b/Kernel_23/include/CGAL/Kernel/global_functions_internal_3.h index 71a8deb5df0..1da73db32ba 100644 --- a/Kernel_23/include/CGAL/Kernel/global_functions_internal_3.h +++ b/Kernel_23/include/CGAL/Kernel/global_functions_internal_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/Kernel/interface_macros.h b/Kernel_23/include/CGAL/Kernel/interface_macros.h index 2df6da583dd..98936757b6f 100644 --- a/Kernel_23/include/CGAL/Kernel/interface_macros.h +++ b/Kernel_23/include/CGAL/Kernel/interface_macros.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/Kernel/mpl.h b/Kernel_23/include/CGAL/Kernel/mpl.h index 26976ecb71d..e0b6bcaf5c6 100644 --- a/Kernel_23/include/CGAL/Kernel/mpl.h +++ b/Kernel_23/include/CGAL/Kernel/mpl.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/Kernel/solve.h b/Kernel_23/include/CGAL/Kernel/solve.h index 3f0b86b5ec2..7452ff723e8 100644 --- a/Kernel_23/include/CGAL/Kernel/solve.h +++ b/Kernel_23/include/CGAL/Kernel/solve.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/Kernel_checker.h b/Kernel_23/include/CGAL/Kernel_checker.h index 840e0d530e1..bed6cdab64c 100644 --- a/Kernel_23/include/CGAL/Kernel_checker.h +++ b/Kernel_23/include/CGAL/Kernel_checker.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/Kernel_traits.h b/Kernel_23/include/CGAL/Kernel_traits.h index 7867a570205..065b32dd94a 100644 --- a/Kernel_23/include/CGAL/Kernel_traits.h +++ b/Kernel_23/include/CGAL/Kernel_traits.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/Line_2.h b/Kernel_23/include/CGAL/Line_2.h index 049f21dcb5d..639f4e1f17b 100644 --- a/Kernel_23/include/CGAL/Line_2.h +++ b/Kernel_23/include/CGAL/Line_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/Line_3.h b/Kernel_23/include/CGAL/Line_3.h index 61bbd7292b0..7251a000617 100644 --- a/Kernel_23/include/CGAL/Line_3.h +++ b/Kernel_23/include/CGAL/Line_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/Origin.h b/Kernel_23/include/CGAL/Origin.h index af056719cf2..70b3f949531 100644 --- a/Kernel_23/include/CGAL/Origin.h +++ b/Kernel_23/include/CGAL/Origin.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/Plane_3.h b/Kernel_23/include/CGAL/Plane_3.h index 50cd880667d..39018b2e12c 100644 --- a/Kernel_23/include/CGAL/Plane_3.h +++ b/Kernel_23/include/CGAL/Plane_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/Point_2.h b/Kernel_23/include/CGAL/Point_2.h index e01e4a682b6..a7c53ee5a05 100644 --- a/Kernel_23/include/CGAL/Point_2.h +++ b/Kernel_23/include/CGAL/Point_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/Point_3.h b/Kernel_23/include/CGAL/Point_3.h index 90b74eef8de..c18a1e5ec5c 100644 --- a/Kernel_23/include/CGAL/Point_3.h +++ b/Kernel_23/include/CGAL/Point_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/Qualified_result_of.h b/Kernel_23/include/CGAL/Qualified_result_of.h index ab7a55b4f63..7d0391dc286 100644 --- a/Kernel_23/include/CGAL/Qualified_result_of.h +++ b/Kernel_23/include/CGAL/Qualified_result_of.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/Ray_2.h b/Kernel_23/include/CGAL/Ray_2.h index 399456e222f..f78ebcc189c 100644 --- a/Kernel_23/include/CGAL/Ray_2.h +++ b/Kernel_23/include/CGAL/Ray_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/Ray_3.h b/Kernel_23/include/CGAL/Ray_3.h index 490024d7f29..d1241cb9d00 100644 --- a/Kernel_23/include/CGAL/Ray_3.h +++ b/Kernel_23/include/CGAL/Ray_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/Segment_2.h b/Kernel_23/include/CGAL/Segment_2.h index 20981a1b590..f44f67c63f9 100644 --- a/Kernel_23/include/CGAL/Segment_2.h +++ b/Kernel_23/include/CGAL/Segment_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/Segment_3.h b/Kernel_23/include/CGAL/Segment_3.h index ee43db5cca1..2d8fa6008be 100644 --- a/Kernel_23/include/CGAL/Segment_3.h +++ b/Kernel_23/include/CGAL/Segment_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/Sphere_3.h b/Kernel_23/include/CGAL/Sphere_3.h index 926efe13c8c..621189239bd 100644 --- a/Kernel_23/include/CGAL/Sphere_3.h +++ b/Kernel_23/include/CGAL/Sphere_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/Tetrahedron_3.h b/Kernel_23/include/CGAL/Tetrahedron_3.h index 1d3f710bd34..06c87448f04 100644 --- a/Kernel_23/include/CGAL/Tetrahedron_3.h +++ b/Kernel_23/include/CGAL/Tetrahedron_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/Triangle_2.h b/Kernel_23/include/CGAL/Triangle_2.h index 0f29cb14f03..94d903f8a3f 100644 --- a/Kernel_23/include/CGAL/Triangle_2.h +++ b/Kernel_23/include/CGAL/Triangle_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/Triangle_3.h b/Kernel_23/include/CGAL/Triangle_3.h index eb19c066366..9ec2cd25500 100644 --- a/Kernel_23/include/CGAL/Triangle_3.h +++ b/Kernel_23/include/CGAL/Triangle_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/Vector_2.h b/Kernel_23/include/CGAL/Vector_2.h index da673057cd2..8c11272e5ff 100644 --- a/Kernel_23/include/CGAL/Vector_2.h +++ b/Kernel_23/include/CGAL/Vector_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/Vector_3.h b/Kernel_23/include/CGAL/Vector_3.h index 539209144ac..c4a17994f55 100644 --- a/Kernel_23/include/CGAL/Vector_3.h +++ b/Kernel_23/include/CGAL/Vector_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/aff_transformation_tags.h b/Kernel_23/include/CGAL/aff_transformation_tags.h index 0b799438394..f950814c9b3 100644 --- a/Kernel_23/include/CGAL/aff_transformation_tags.h +++ b/Kernel_23/include/CGAL/aff_transformation_tags.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/basic.h b/Kernel_23/include/CGAL/basic.h index 7c00afac958..275cecdfc94 100644 --- a/Kernel_23/include/CGAL/basic.h +++ b/Kernel_23/include/CGAL/basic.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/basic_classes.h b/Kernel_23/include/CGAL/basic_classes.h index 3328122a9e8..b86d00826bb 100644 --- a/Kernel_23/include/CGAL/basic_classes.h +++ b/Kernel_23/include/CGAL/basic_classes.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/basic_constructions_2.h b/Kernel_23/include/CGAL/basic_constructions_2.h index 3b97cbc5d5a..17ec20a34e8 100644 --- a/Kernel_23/include/CGAL/basic_constructions_2.h +++ b/Kernel_23/include/CGAL/basic_constructions_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/basic_constructions_3.h b/Kernel_23/include/CGAL/basic_constructions_3.h index 554c10515d1..902b2c5ef4e 100644 --- a/Kernel_23/include/CGAL/basic_constructions_3.h +++ b/Kernel_23/include/CGAL/basic_constructions_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/cartesian_homogeneous_conversion.h b/Kernel_23/include/CGAL/cartesian_homogeneous_conversion.h index 002e8a5e2ae..b1c49e56a03 100644 --- a/Kernel_23/include/CGAL/cartesian_homogeneous_conversion.h +++ b/Kernel_23/include/CGAL/cartesian_homogeneous_conversion.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/determinant.h b/Kernel_23/include/CGAL/determinant.h index 2008bfe98e9..b23d8f181d4 100644 --- a/Kernel_23/include/CGAL/determinant.h +++ b/Kernel_23/include/CGAL/determinant.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/distance_predicates_2.h b/Kernel_23/include/CGAL/distance_predicates_2.h index 240df22a681..8d17317421a 100644 --- a/Kernel_23/include/CGAL/distance_predicates_2.h +++ b/Kernel_23/include/CGAL/distance_predicates_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/distance_predicates_3.h b/Kernel_23/include/CGAL/distance_predicates_3.h index a26f4542ff7..5adecc446ad 100644 --- a/Kernel_23/include/CGAL/distance_predicates_3.h +++ b/Kernel_23/include/CGAL/distance_predicates_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/enum.h b/Kernel_23/include/CGAL/enum.h index e056152cda8..22f7737a550 100644 --- a/Kernel_23/include/CGAL/enum.h +++ b/Kernel_23/include/CGAL/enum.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/functions_on_enums.h b/Kernel_23/include/CGAL/functions_on_enums.h index 66813b394b6..37d894b9ad2 100644 --- a/Kernel_23/include/CGAL/functions_on_enums.h +++ b/Kernel_23/include/CGAL/functions_on_enums.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/kernel_assertions.h b/Kernel_23/include/CGAL/kernel_assertions.h index 9951ac97a92..61716e70727 100644 --- a/Kernel_23/include/CGAL/kernel_assertions.h +++ b/Kernel_23/include/CGAL/kernel_assertions.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/kernel_basic.h b/Kernel_23/include/CGAL/kernel_basic.h index 4abf52d553d..d89730f47e2 100644 --- a/Kernel_23/include/CGAL/kernel_basic.h +++ b/Kernel_23/include/CGAL/kernel_basic.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/kernel_to_kernel.h b/Kernel_23/include/CGAL/kernel_to_kernel.h index a1494002d79..ba9957759b1 100644 --- a/Kernel_23/include/CGAL/kernel_to_kernel.h +++ b/Kernel_23/include/CGAL/kernel_to_kernel.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/predicates/sign_of_determinant.h b/Kernel_23/include/CGAL/predicates/sign_of_determinant.h index d85e3f2db24..221f1e38571 100644 --- a/Kernel_23/include/CGAL/predicates/sign_of_determinant.h +++ b/Kernel_23/include/CGAL/predicates/sign_of_determinant.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/predicates_on_lines_2.h b/Kernel_23/include/CGAL/predicates_on_lines_2.h index d8791086a9c..6baad9fdbfd 100644 --- a/Kernel_23/include/CGAL/predicates_on_lines_2.h +++ b/Kernel_23/include/CGAL/predicates_on_lines_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/predicates_on_points_2.h b/Kernel_23/include/CGAL/predicates_on_points_2.h index 88857f0583b..685a5d519e1 100644 --- a/Kernel_23/include/CGAL/predicates_on_points_2.h +++ b/Kernel_23/include/CGAL/predicates_on_points_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/predicates_on_points_3.h b/Kernel_23/include/CGAL/predicates_on_points_3.h index 5b853af15dd..f71125efbac 100644 --- a/Kernel_23/include/CGAL/predicates_on_points_3.h +++ b/Kernel_23/include/CGAL/predicates_on_points_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/rational_rotation.h b/Kernel_23/include/CGAL/rational_rotation.h index 9a0fe94db5c..fd8a7e805d0 100644 --- a/Kernel_23/include/CGAL/rational_rotation.h +++ b/Kernel_23/include/CGAL/rational_rotation.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/representation_tags.h b/Kernel_23/include/CGAL/representation_tags.h index 8efc11d0cf2..bcb87a65bd0 100644 --- a/Kernel_23/include/CGAL/representation_tags.h +++ b/Kernel_23/include/CGAL/representation_tags.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/user_classes.h b/Kernel_23/include/CGAL/user_classes.h index 355719b39d0..7a4d13e076d 100644 --- a/Kernel_23/include/CGAL/user_classes.h +++ b/Kernel_23/include/CGAL/user_classes.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/src/CGAL/kernel.cpp b/Kernel_23/src/CGAL/kernel.cpp index a3bbcfd5a16..8e4ec40822f 100644 --- a/Kernel_23/src/CGAL/kernel.cpp +++ b/Kernel_23/src/CGAL/kernel.cpp @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/test/Kernel_23/Cartesian.cpp b/Kernel_23/test/Kernel_23/Cartesian.cpp index 6113729bc73..11575142b69 100644 --- a/Kernel_23/test/Kernel_23/Cartesian.cpp +++ b/Kernel_23/test/Kernel_23/Cartesian.cpp @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Kernel_23/test/Kernel_23/Filtered_cartesian.cpp b/Kernel_23/test/Kernel_23/Filtered_cartesian.cpp index 675a1cd7d1a..2930068a9ac 100644 --- a/Kernel_23/test/Kernel_23/Filtered_cartesian.cpp +++ b/Kernel_23/test/Kernel_23/Filtered_cartesian.cpp @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Kernel_23/test/Kernel_23/Filtered_homogeneous.cpp b/Kernel_23/test/Kernel_23/Filtered_homogeneous.cpp index b2538c81d21..34f27b2aa80 100644 --- a/Kernel_23/test/Kernel_23/Filtered_homogeneous.cpp +++ b/Kernel_23/test/Kernel_23/Filtered_homogeneous.cpp @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Kernel_23/test/Kernel_23/Homogeneous.cpp b/Kernel_23/test/Kernel_23/Homogeneous.cpp index d48178db7d1..a719e81747e 100644 --- a/Kernel_23/test/Kernel_23/Homogeneous.cpp +++ b/Kernel_23/test/Kernel_23/Homogeneous.cpp @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Kernel_23/test/Kernel_23/Lazy_kernel.cpp b/Kernel_23/test/Kernel_23/Lazy_kernel.cpp index 87d891942eb..e6f7807798f 100644 --- a/Kernel_23/test/Kernel_23/Lazy_kernel.cpp +++ b/Kernel_23/test/Kernel_23/Lazy_kernel.cpp @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Kernel_23/test/Kernel_23/Simple_cartesian.cpp b/Kernel_23/test/Kernel_23/Simple_cartesian.cpp index 783279de7df..95cfbb93663 100644 --- a/Kernel_23/test/Kernel_23/Simple_cartesian.cpp +++ b/Kernel_23/test/Kernel_23/Simple_cartesian.cpp @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Kernel_23/test/Kernel_23/Simple_homogeneous.cpp b/Kernel_23/test/Kernel_23/Simple_homogeneous.cpp index 23cbe75d984..a249e363057 100644 --- a/Kernel_23/test/Kernel_23/Simple_homogeneous.cpp +++ b/Kernel_23/test/Kernel_23/Simple_homogeneous.cpp @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Kernel_23/test/Kernel_23/include/CGAL/Precise_numbers.h b/Kernel_23/test/Kernel_23/include/CGAL/Precise_numbers.h index 04d69693a00..9f11130d913 100644 --- a/Kernel_23/test/Kernel_23/include/CGAL/Precise_numbers.h +++ b/Kernel_23/test/Kernel_23/include/CGAL/Precise_numbers.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Kernel_23/test/Kernel_23/include/CGAL/_test_2.h b/Kernel_23/test/Kernel_23/include/CGAL/_test_2.h index 2364df10e9b..565f1b83ec8 100644 --- a/Kernel_23/test/Kernel_23/include/CGAL/_test_2.h +++ b/Kernel_23/test/Kernel_23/include/CGAL/_test_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Kernel_23/test/Kernel_23/include/CGAL/_test_3.h b/Kernel_23/test/Kernel_23/include/CGAL/_test_3.h index 445b974a407..d3f941ce700 100644 --- a/Kernel_23/test/Kernel_23/include/CGAL/_test_3.h +++ b/Kernel_23/test/Kernel_23/include/CGAL/_test_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Kernel_23/test/Kernel_23/include/CGAL/_test_angle.h b/Kernel_23/test/Kernel_23/include/CGAL/_test_angle.h index 3b1cd86af16..c787eb015a8 100644 --- a/Kernel_23/test/Kernel_23/include/CGAL/_test_angle.h +++ b/Kernel_23/test/Kernel_23/include/CGAL/_test_angle.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_aff_transformation_2.h b/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_aff_transformation_2.h index a4329f3c65f..3d524c8ae43 100644 --- a/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_aff_transformation_2.h +++ b/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_aff_transformation_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_aff_transformation_3.h b/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_aff_transformation_3.h index 02f624bc9fd..559f4e79def 100644 --- a/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_aff_transformation_3.h +++ b/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_aff_transformation_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_circle_2.h b/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_circle_2.h index b1db389a83d..299076c7974 100644 --- a/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_circle_2.h +++ b/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_circle_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_circle_3.h b/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_circle_3.h index d720eb5d6c9..4db57065987 100644 --- a/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_circle_3.h +++ b/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_circle_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_circle_new_2.h b/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_circle_new_2.h index 4ca22c09494..feb7bf92c36 100644 --- a/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_circle_new_2.h +++ b/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_circle_new_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_direction_2.h b/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_direction_2.h index 04ffd9250ed..8b8d66d3f5f 100644 --- a/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_direction_2.h +++ b/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_direction_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_direction_3.h b/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_direction_3.h index 5437799e939..9bc74fa8d69 100644 --- a/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_direction_3.h +++ b/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_direction_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_iso_cuboid_3.h b/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_iso_cuboid_3.h index 16bd0ab7e83..d36687a5b49 100644 --- a/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_iso_cuboid_3.h +++ b/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_iso_cuboid_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_iso_rectangle_2.h b/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_iso_rectangle_2.h index 9bc20eaf192..e893bcff351 100644 --- a/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_iso_rectangle_2.h +++ b/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_iso_rectangle_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_iso_rectangle_new_2.h b/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_iso_rectangle_new_2.h index 50e92cf801a..180fa82bbff 100644 --- a/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_iso_rectangle_new_2.h +++ b/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_iso_rectangle_new_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_line_2.h b/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_line_2.h index 0d8b3fa41df..8a833d8b14b 100644 --- a/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_line_2.h +++ b/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_line_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_line_3.h b/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_line_3.h index b4fc0cd29c0..cfe942a8a58 100644 --- a/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_line_3.h +++ b/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_line_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_line_new_2.h b/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_line_new_2.h index 516dfff99e3..9fe77b0d1a3 100644 --- a/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_line_new_2.h +++ b/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_line_new_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_object.h b/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_object.h index f93377b4156..12db9c3cb24 100644 --- a/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_object.h +++ b/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_object.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_plane_3.h b/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_plane_3.h index 67c797d6631..cc8c9209cc0 100644 --- a/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_plane_3.h +++ b/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_plane_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_point_2.h b/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_point_2.h index 7b32bf6cc44..8bacaea0545 100644 --- a/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_point_2.h +++ b/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_point_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_point_3.h b/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_point_3.h index a0112d23f17..2190a5bf47b 100644 --- a/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_point_3.h +++ b/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_point_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_quotient.h b/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_quotient.h index 804d6dd9112..393aa568c0c 100644 --- a/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_quotient.h +++ b/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_quotient.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_ray_2.h b/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_ray_2.h index c09b515a917..f727771ed50 100644 --- a/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_ray_2.h +++ b/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_ray_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_ray_3.h b/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_ray_3.h index bf893266574..b427a3288ac 100644 --- a/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_ray_3.h +++ b/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_ray_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_ray_new_2.h b/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_ray_new_2.h index 4a8b4c2dc37..cefb586461f 100644 --- a/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_ray_new_2.h +++ b/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_ray_new_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_segment_2.h b/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_segment_2.h index eabe8c49598..10713a03be1 100644 --- a/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_segment_2.h +++ b/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_segment_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_segment_3.h b/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_segment_3.h index 3ec59c5ab7b..3b9142dff37 100644 --- a/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_segment_3.h +++ b/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_segment_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_segment_new_2.h b/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_segment_new_2.h index 58a35f32a14..a970efe3e8c 100644 --- a/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_segment_new_2.h +++ b/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_segment_new_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_sphere_3.h b/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_sphere_3.h index bfc90031b3b..935f0104b4b 100644 --- a/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_sphere_3.h +++ b/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_sphere_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_tetrahedron_3.h b/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_tetrahedron_3.h index 71c26ef0c51..febee51039e 100644 --- a/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_tetrahedron_3.h +++ b/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_tetrahedron_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_triangle_2.h b/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_triangle_2.h index 7ce14359fe6..9afe608edd2 100644 --- a/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_triangle_2.h +++ b/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_triangle_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_triangle_3.h b/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_triangle_3.h index a2100299031..331d7ddc542 100644 --- a/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_triangle_3.h +++ b/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_triangle_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_triangle_new_2.h b/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_triangle_new_2.h index 517574f3f26..2fb3898c969 100644 --- a/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_triangle_new_2.h +++ b/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_triangle_new_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_vector_2.h b/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_vector_2.h index cdb90000955..574dc7c8f74 100644 --- a/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_vector_2.h +++ b/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_vector_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_vector_3.h b/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_vector_3.h index 4bd02d576fc..9e46dc0ea5d 100644 --- a/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_vector_3.h +++ b/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_vector_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Kernel_23/test/Kernel_23/include/CGAL/_test_compare_dihedral_angle_3.h b/Kernel_23/test/Kernel_23/include/CGAL/_test_compare_dihedral_angle_3.h index 2dc3fa6f446..15da18c3572 100644 --- a/Kernel_23/test/Kernel_23/include/CGAL/_test_compare_dihedral_angle_3.h +++ b/Kernel_23/test/Kernel_23/include/CGAL/_test_compare_dihedral_angle_3.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_constructions_2.h b/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_constructions_2.h index b2e5d650bc5..94f82bf706f 100644 --- a/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_constructions_2.h +++ b/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_constructions_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_constructions_3.h b/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_constructions_3.h index 6a689e5537c..ddac684c523 100644 --- a/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_constructions_3.h +++ b/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_constructions_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_coplanar_3.h b/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_coplanar_3.h index 86738d14af6..af75f68fa87 100644 --- a/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_coplanar_3.h +++ b/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_coplanar_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_determinant.h b/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_determinant.h index 033f753f312..6a252f10daa 100644 --- a/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_determinant.h +++ b/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_determinant.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_direction_2.h b/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_direction_2.h index eb09f71c76d..e871f11e7b8 100644 --- a/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_direction_2.h +++ b/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_direction_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_line_2.h b/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_line_2.h index a756bac765c..49b2e1f57b9 100644 --- a/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_line_2.h +++ b/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_line_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_plane_3.h b/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_plane_3.h index f50c9207b2a..ef21d38aeca 100644 --- a/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_plane_3.h +++ b/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_plane_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_point_2.h b/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_point_2.h index 787a5b2fb93..964c1021f97 100644 --- a/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_point_2.h +++ b/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_point_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_point_3.h b/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_point_3.h index e0b329a8571..3247a3eb347 100644 --- a/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_point_3.h +++ b/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_point_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_point_conversion.h b/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_point_conversion.h index 90397beb2e4..b850fa2cf2b 100644 --- a/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_point_conversion.h +++ b/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_point_conversion.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_point_line_2.h b/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_point_line_2.h index 417e3b3457f..5a79263f859 100644 --- a/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_point_line_2.h +++ b/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_point_line_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_point_segment_2.h b/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_point_segment_2.h index 1613a6ac081..3c233371cab 100644 --- a/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_point_segment_2.h +++ b/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_point_segment_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_point_vector_2.h b/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_point_vector_2.h index f9c0d0df901..4459dfcd7b8 100644 --- a/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_point_vector_2.h +++ b/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_point_vector_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_point_vector_3.h b/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_point_vector_3.h index 9610d0db49e..ff54e120969 100644 --- a/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_point_vector_3.h +++ b/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_point_vector_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_points_implicit_sphere.h b/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_points_implicit_sphere.h index a139d98441b..400f598c5ee 100644 --- a/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_points_implicit_sphere.h +++ b/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_points_implicit_sphere.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_segment_2.h b/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_segment_2.h index 598e6558caa..7098b52f05a 100644 --- a/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_segment_2.h +++ b/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_segment_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_vector_2.h b/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_vector_2.h index 0fa8b5f835e..f477f5635de 100644 --- a/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_vector_2.h +++ b/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_vector_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_vector_3.h b/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_vector_3.h index 06d155ae100..749110b9fc0 100644 --- a/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_vector_3.h +++ b/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_vector_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Kernel_23/test/Kernel_23/include/CGAL/_test_further_fct_point_2.h b/Kernel_23/test/Kernel_23/include/CGAL/_test_further_fct_point_2.h index cb84c8453aa..e1a9b315878 100644 --- a/Kernel_23/test/Kernel_23/include/CGAL/_test_further_fct_point_2.h +++ b/Kernel_23/test/Kernel_23/include/CGAL/_test_further_fct_point_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Kernel_23/test/Kernel_23/include/CGAL/_test_further_fct_point_line_2.h b/Kernel_23/test/Kernel_23/include/CGAL/_test_further_fct_point_line_2.h index 2edbf60b253..8819d759db5 100644 --- a/Kernel_23/test/Kernel_23/include/CGAL/_test_further_fct_point_line_2.h +++ b/Kernel_23/test/Kernel_23/include/CGAL/_test_further_fct_point_line_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Kernel_23/test/Kernel_23/include/CGAL/_test_further_fct_point_plane_3.h b/Kernel_23/test/Kernel_23/include/CGAL/_test_further_fct_point_plane_3.h index 6834dc76b3c..fc633c1271c 100644 --- a/Kernel_23/test/Kernel_23/include/CGAL/_test_further_fct_point_plane_3.h +++ b/Kernel_23/test/Kernel_23/include/CGAL/_test_further_fct_point_plane_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Kernel_23/test/Kernel_23/include/CGAL/_test_io.h b/Kernel_23/test/Kernel_23/include/CGAL/_test_io.h index 87f6bc89fd4..fdb913e2084 100644 --- a/Kernel_23/test/Kernel_23/include/CGAL/_test_io.h +++ b/Kernel_23/test/Kernel_23/include/CGAL/_test_io.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Kernel_23/test/Kernel_23/include/CGAL/_test_mf_plane_3_to_2d.h b/Kernel_23/test/Kernel_23/include/CGAL/_test_mf_plane_3_to_2d.h index c20b2bf9910..10de5a9da62 100644 --- a/Kernel_23/test/Kernel_23/include/CGAL/_test_mf_plane_3_to_2d.h +++ b/Kernel_23/test/Kernel_23/include/CGAL/_test_mf_plane_3_to_2d.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Kernel_23/test/Kernel_23/include/CGAL/_test_new_2.h b/Kernel_23/test/Kernel_23/include/CGAL/_test_new_2.h index d78fb0ff678..cfe390c5c24 100644 --- a/Kernel_23/test/Kernel_23/include/CGAL/_test_new_2.h +++ b/Kernel_23/test/Kernel_23/include/CGAL/_test_new_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Kernel_23/test/Kernel_23/include/CGAL/_test_new_3.h b/Kernel_23/test/Kernel_23/include/CGAL/_test_new_3.h index edd0cc1ed5e..d2d6a89db07 100644 --- a/Kernel_23/test/Kernel_23/include/CGAL/_test_new_3.h +++ b/Kernel_23/test/Kernel_23/include/CGAL/_test_new_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Kernel_23/test/Kernel_23/include/CGAL/_test_orientation_and_bounded_side.h b/Kernel_23/test/Kernel_23/include/CGAL/_test_orientation_and_bounded_side.h index bb8df47221c..9d85fe0435c 100644 --- a/Kernel_23/test/Kernel_23/include/CGAL/_test_orientation_and_bounded_side.h +++ b/Kernel_23/test/Kernel_23/include/CGAL/_test_orientation_and_bounded_side.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Kernel_23/test/Kernel_23/test_kernel__.cpp b/Kernel_23/test/Kernel_23/test_kernel__.cpp index e4d6480c0c9..7b1a6f66106 100644 --- a/Kernel_23/test/Kernel_23/test_kernel__.cpp +++ b/Kernel_23/test/Kernel_23/test_kernel__.cpp @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Kernel_d/include/CGAL/Cartesian_d.h b/Kernel_d/include/CGAL/Cartesian_d.h index eeaad31bce9..2cc5bfbbcff 100644 --- a/Kernel_d/include/CGAL/Cartesian_d.h +++ b/Kernel_d/include/CGAL/Cartesian_d.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_d/include/CGAL/Homogeneous_d.h b/Kernel_d/include/CGAL/Homogeneous_d.h index 87d86876fa5..871f3f4df28 100644 --- a/Kernel_d/include/CGAL/Homogeneous_d.h +++ b/Kernel_d/include/CGAL/Homogeneous_d.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_d/include/CGAL/Kernel_d/Aff_transformationCd.h b/Kernel_d/include/CGAL/Kernel_d/Aff_transformationCd.h index c06c81a953d..b9d96225dfb 100644 --- a/Kernel_d/include/CGAL/Kernel_d/Aff_transformationCd.h +++ b/Kernel_d/include/CGAL/Kernel_d/Aff_transformationCd.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_d/include/CGAL/Kernel_d/Aff_transformationHd.h b/Kernel_d/include/CGAL/Kernel_d/Aff_transformationHd.h index 082b69462d4..1d950ffeda4 100644 --- a/Kernel_d/include/CGAL/Kernel_d/Aff_transformationHd.h +++ b/Kernel_d/include/CGAL/Kernel_d/Aff_transformationHd.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_d/include/CGAL/Kernel_d/Aff_transformation_d.h b/Kernel_d/include/CGAL/Kernel_d/Aff_transformation_d.h index d9b22c52e2f..915c0dd8088 100644 --- a/Kernel_d/include/CGAL/Kernel_d/Aff_transformation_d.h +++ b/Kernel_d/include/CGAL/Kernel_d/Aff_transformation_d.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_d/include/CGAL/Kernel_d/Cartesian_const_iterator_d.h b/Kernel_d/include/CGAL/Kernel_d/Cartesian_const_iterator_d.h index 5c403cc2c79..a4ea26c48f5 100644 --- a/Kernel_d/include/CGAL/Kernel_d/Cartesian_const_iterator_d.h +++ b/Kernel_d/include/CGAL/Kernel_d/Cartesian_const_iterator_d.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_d/include/CGAL/Kernel_d/DirectionCd.h b/Kernel_d/include/CGAL/Kernel_d/DirectionCd.h index d3af83c2b7e..84d91b8cf8e 100644 --- a/Kernel_d/include/CGAL/Kernel_d/DirectionCd.h +++ b/Kernel_d/include/CGAL/Kernel_d/DirectionCd.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_d/include/CGAL/Kernel_d/DirectionCd_impl.h b/Kernel_d/include/CGAL/Kernel_d/DirectionCd_impl.h index a04e9de9849..dd56f0e77c6 100644 --- a/Kernel_d/include/CGAL/Kernel_d/DirectionCd_impl.h +++ b/Kernel_d/include/CGAL/Kernel_d/DirectionCd_impl.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_d/include/CGAL/Kernel_d/DirectionHd.h b/Kernel_d/include/CGAL/Kernel_d/DirectionHd.h index 8befa442cce..af5676ddb58 100644 --- a/Kernel_d/include/CGAL/Kernel_d/DirectionHd.h +++ b/Kernel_d/include/CGAL/Kernel_d/DirectionHd.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_d/include/CGAL/Kernel_d/DirectionHd_impl.h b/Kernel_d/include/CGAL/Kernel_d/DirectionHd_impl.h index 0d823d30d6e..0f72295d6a0 100644 --- a/Kernel_d/include/CGAL/Kernel_d/DirectionHd_impl.h +++ b/Kernel_d/include/CGAL/Kernel_d/DirectionHd_impl.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_d/include/CGAL/Kernel_d/Direction_d.h b/Kernel_d/include/CGAL/Kernel_d/Direction_d.h index d51fb5749cd..f92274c388c 100644 --- a/Kernel_d/include/CGAL/Kernel_d/Direction_d.h +++ b/Kernel_d/include/CGAL/Kernel_d/Direction_d.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_d/include/CGAL/Kernel_d/HyperplaneCd.h b/Kernel_d/include/CGAL/Kernel_d/HyperplaneCd.h index 68ccddab32b..7dc7494e66e 100644 --- a/Kernel_d/include/CGAL/Kernel_d/HyperplaneCd.h +++ b/Kernel_d/include/CGAL/Kernel_d/HyperplaneCd.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_d/include/CGAL/Kernel_d/HyperplaneCd_impl.h b/Kernel_d/include/CGAL/Kernel_d/HyperplaneCd_impl.h index 7f354cef68d..8d0842d9104 100644 --- a/Kernel_d/include/CGAL/Kernel_d/HyperplaneCd_impl.h +++ b/Kernel_d/include/CGAL/Kernel_d/HyperplaneCd_impl.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_d/include/CGAL/Kernel_d/HyperplaneHd.h b/Kernel_d/include/CGAL/Kernel_d/HyperplaneHd.h index d7285ea7856..b8008b310e2 100644 --- a/Kernel_d/include/CGAL/Kernel_d/HyperplaneHd.h +++ b/Kernel_d/include/CGAL/Kernel_d/HyperplaneHd.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_d/include/CGAL/Kernel_d/HyperplaneHd_impl.h b/Kernel_d/include/CGAL/Kernel_d/HyperplaneHd_impl.h index 92f64eef0c3..88c72376fdd 100644 --- a/Kernel_d/include/CGAL/Kernel_d/HyperplaneHd_impl.h +++ b/Kernel_d/include/CGAL/Kernel_d/HyperplaneHd_impl.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_d/include/CGAL/Kernel_d/Hyperplane_d.h b/Kernel_d/include/CGAL/Kernel_d/Hyperplane_d.h index 79f67b3726c..1a8a37b2b2f 100644 --- a/Kernel_d/include/CGAL/Kernel_d/Hyperplane_d.h +++ b/Kernel_d/include/CGAL/Kernel_d/Hyperplane_d.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_d/include/CGAL/Kernel_d/Interface_classes.h b/Kernel_d/include/CGAL/Kernel_d/Interface_classes.h index adac49a09ee..c2d8cfeffde 100644 --- a/Kernel_d/include/CGAL/Kernel_d/Interface_classes.h +++ b/Kernel_d/include/CGAL/Kernel_d/Interface_classes.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_d/include/CGAL/Kernel_d/Iso_box_d.h b/Kernel_d/include/CGAL/Kernel_d/Iso_box_d.h index 7244e42b688..4a6fe9e06fd 100644 --- a/Kernel_d/include/CGAL/Kernel_d/Iso_box_d.h +++ b/Kernel_d/include/CGAL/Kernel_d/Iso_box_d.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_d/include/CGAL/Kernel_d/Kernel_classesCd.h b/Kernel_d/include/CGAL/Kernel_d/Kernel_classesCd.h index a9c285e7fe9..125fb9ba4f5 100644 --- a/Kernel_d/include/CGAL/Kernel_d/Kernel_classesCd.h +++ b/Kernel_d/include/CGAL/Kernel_d/Kernel_classesCd.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_d/include/CGAL/Kernel_d/Kernel_classesHd.h b/Kernel_d/include/CGAL/Kernel_d/Kernel_classesHd.h index db282486ccd..405394aa97d 100644 --- a/Kernel_d/include/CGAL/Kernel_d/Kernel_classesHd.h +++ b/Kernel_d/include/CGAL/Kernel_d/Kernel_classesHd.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_d/include/CGAL/Kernel_d/Line_d.h b/Kernel_d/include/CGAL/Kernel_d/Line_d.h index 55fb78bcfa1..c1b817ef188 100644 --- a/Kernel_d/include/CGAL/Kernel_d/Line_d.h +++ b/Kernel_d/include/CGAL/Kernel_d/Line_d.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_d/include/CGAL/Kernel_d/Line_d_impl.h b/Kernel_d/include/CGAL/Kernel_d/Line_d_impl.h index 6ceca186e76..ce0a75a2dfb 100644 --- a/Kernel_d/include/CGAL/Kernel_d/Line_d_impl.h +++ b/Kernel_d/include/CGAL/Kernel_d/Line_d_impl.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_d/include/CGAL/Kernel_d/Linear_algebraCd_impl.h b/Kernel_d/include/CGAL/Kernel_d/Linear_algebraCd_impl.h index 34d51ba5b2d..6517e795466 100644 --- a/Kernel_d/include/CGAL/Kernel_d/Linear_algebraCd_impl.h +++ b/Kernel_d/include/CGAL/Kernel_d/Linear_algebraCd_impl.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_d/include/CGAL/Kernel_d/Linear_algebraHd_impl.h b/Kernel_d/include/CGAL/Kernel_d/Linear_algebraHd_impl.h index d566f83e81f..fa591da2314 100644 --- a/Kernel_d/include/CGAL/Kernel_d/Linear_algebraHd_impl.h +++ b/Kernel_d/include/CGAL/Kernel_d/Linear_algebraHd_impl.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_d/include/CGAL/Kernel_d/Matrix__.h b/Kernel_d/include/CGAL/Kernel_d/Matrix__.h index df5ea3867fa..978ecf814b2 100644 --- a/Kernel_d/include/CGAL/Kernel_d/Matrix__.h +++ b/Kernel_d/include/CGAL/Kernel_d/Matrix__.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_d/include/CGAL/Kernel_d/PVDHACd_impl.h b/Kernel_d/include/CGAL/Kernel_d/PVDHACd_impl.h index 26ac965eeb2..dd9213a2e72 100644 --- a/Kernel_d/include/CGAL/Kernel_d/PVDHACd_impl.h +++ b/Kernel_d/include/CGAL/Kernel_d/PVDHACd_impl.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_d/include/CGAL/Kernel_d/PVDHAHd_impl.h b/Kernel_d/include/CGAL/Kernel_d/PVDHAHd_impl.h index ae58d5c6271..1173498fd43 100644 --- a/Kernel_d/include/CGAL/Kernel_d/PVDHAHd_impl.h +++ b/Kernel_d/include/CGAL/Kernel_d/PVDHAHd_impl.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_d/include/CGAL/Kernel_d/Pair_d.h b/Kernel_d/include/CGAL/Kernel_d/Pair_d.h index 11ac2d1200f..564e143b658 100644 --- a/Kernel_d/include/CGAL/Kernel_d/Pair_d.h +++ b/Kernel_d/include/CGAL/Kernel_d/Pair_d.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_d/include/CGAL/Kernel_d/PointCd.h b/Kernel_d/include/CGAL/Kernel_d/PointCd.h index 78b955afd1f..2eb1620e2b9 100644 --- a/Kernel_d/include/CGAL/Kernel_d/PointCd.h +++ b/Kernel_d/include/CGAL/Kernel_d/PointCd.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_d/include/CGAL/Kernel_d/PointCd_impl.h b/Kernel_d/include/CGAL/Kernel_d/PointCd_impl.h index 636c3f9e6f1..a18e0d6be37 100644 --- a/Kernel_d/include/CGAL/Kernel_d/PointCd_impl.h +++ b/Kernel_d/include/CGAL/Kernel_d/PointCd_impl.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_d/include/CGAL/Kernel_d/PointHd.h b/Kernel_d/include/CGAL/Kernel_d/PointHd.h index 9d25ea648e4..58d48c8f39f 100644 --- a/Kernel_d/include/CGAL/Kernel_d/PointHd.h +++ b/Kernel_d/include/CGAL/Kernel_d/PointHd.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_d/include/CGAL/Kernel_d/PointHd_impl.h b/Kernel_d/include/CGAL/Kernel_d/PointHd_impl.h index 8fa7ffae12a..c445d7afae4 100644 --- a/Kernel_d/include/CGAL/Kernel_d/PointHd_impl.h +++ b/Kernel_d/include/CGAL/Kernel_d/PointHd_impl.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_d/include/CGAL/Kernel_d/Point_d.h b/Kernel_d/include/CGAL/Kernel_d/Point_d.h index 7089f10efcf..7e80293b4a0 100644 --- a/Kernel_d/include/CGAL/Kernel_d/Point_d.h +++ b/Kernel_d/include/CGAL/Kernel_d/Point_d.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_d/include/CGAL/Kernel_d/Ray_d.h b/Kernel_d/include/CGAL/Kernel_d/Ray_d.h index 1cc4ec62023..80de9a34025 100644 --- a/Kernel_d/include/CGAL/Kernel_d/Ray_d.h +++ b/Kernel_d/include/CGAL/Kernel_d/Ray_d.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_d/include/CGAL/Kernel_d/Segment_d.h b/Kernel_d/include/CGAL/Kernel_d/Segment_d.h index d531e3ca6b7..7a3be0a7178 100644 --- a/Kernel_d/include/CGAL/Kernel_d/Segment_d.h +++ b/Kernel_d/include/CGAL/Kernel_d/Segment_d.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_d/include/CGAL/Kernel_d/Sphere_d.h b/Kernel_d/include/CGAL/Kernel_d/Sphere_d.h index 8a1b0b57069..5756fccee0e 100644 --- a/Kernel_d/include/CGAL/Kernel_d/Sphere_d.h +++ b/Kernel_d/include/CGAL/Kernel_d/Sphere_d.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_d/include/CGAL/Kernel_d/Tuple_d.h b/Kernel_d/include/CGAL/Kernel_d/Tuple_d.h index 9bc6b2c3ab5..425a82a968f 100644 --- a/Kernel_d/include/CGAL/Kernel_d/Tuple_d.h +++ b/Kernel_d/include/CGAL/Kernel_d/Tuple_d.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_d/include/CGAL/Kernel_d/VectorCd.h b/Kernel_d/include/CGAL/Kernel_d/VectorCd.h index 2f6be990e62..f58827d58c3 100644 --- a/Kernel_d/include/CGAL/Kernel_d/VectorCd.h +++ b/Kernel_d/include/CGAL/Kernel_d/VectorCd.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_d/include/CGAL/Kernel_d/VectorCd_impl.h b/Kernel_d/include/CGAL/Kernel_d/VectorCd_impl.h index ce24b5cb602..e7de679e708 100644 --- a/Kernel_d/include/CGAL/Kernel_d/VectorCd_impl.h +++ b/Kernel_d/include/CGAL/Kernel_d/VectorCd_impl.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_d/include/CGAL/Kernel_d/VectorHd.h b/Kernel_d/include/CGAL/Kernel_d/VectorHd.h index cbc09886ef0..f468ceab6e8 100644 --- a/Kernel_d/include/CGAL/Kernel_d/VectorHd.h +++ b/Kernel_d/include/CGAL/Kernel_d/VectorHd.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_d/include/CGAL/Kernel_d/VectorHd_impl.h b/Kernel_d/include/CGAL/Kernel_d/VectorHd_impl.h index b8eaa5dc178..6a7cec5bc9f 100644 --- a/Kernel_d/include/CGAL/Kernel_d/VectorHd_impl.h +++ b/Kernel_d/include/CGAL/Kernel_d/VectorHd_impl.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_d/include/CGAL/Kernel_d/Vector__.h b/Kernel_d/include/CGAL/Kernel_d/Vector__.h index 1d1fe595097..b731d0ea23a 100644 --- a/Kernel_d/include/CGAL/Kernel_d/Vector__.h +++ b/Kernel_d/include/CGAL/Kernel_d/Vector__.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_d/include/CGAL/Kernel_d/Vector_d.h b/Kernel_d/include/CGAL/Kernel_d/Vector_d.h index 72521af2ff1..f875df094a0 100644 --- a/Kernel_d/include/CGAL/Kernel_d/Vector_d.h +++ b/Kernel_d/include/CGAL/Kernel_d/Vector_d.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_d/include/CGAL/Kernel_d/debug.h b/Kernel_d/include/CGAL/Kernel_d/debug.h index 7cbc69d3009..b2d15975e91 100644 --- a/Kernel_d/include/CGAL/Kernel_d/debug.h +++ b/Kernel_d/include/CGAL/Kernel_d/debug.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_d/include/CGAL/Kernel_d/function_objects.h b/Kernel_d/include/CGAL/Kernel_d/function_objects.h index c2ec827116b..b58c57535c9 100644 --- a/Kernel_d/include/CGAL/Kernel_d/function_objects.h +++ b/Kernel_d/include/CGAL/Kernel_d/function_objects.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_d/include/CGAL/Kernel_d/function_objectsCd.h b/Kernel_d/include/CGAL/Kernel_d/function_objectsCd.h index c6027e8053f..29bad1435c5 100644 --- a/Kernel_d/include/CGAL/Kernel_d/function_objectsCd.h +++ b/Kernel_d/include/CGAL/Kernel_d/function_objectsCd.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_d/include/CGAL/Kernel_d/function_objectsHd.h b/Kernel_d/include/CGAL/Kernel_d/function_objectsHd.h index 6563639d88c..0a5d8baa050 100644 --- a/Kernel_d/include/CGAL/Kernel_d/function_objectsHd.h +++ b/Kernel_d/include/CGAL/Kernel_d/function_objectsHd.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_d/include/CGAL/Kernel_d/intersection_objectsCd.h b/Kernel_d/include/CGAL/Kernel_d/intersection_objectsCd.h index 5d71f91c8be..aec9652583d 100644 --- a/Kernel_d/include/CGAL/Kernel_d/intersection_objectsCd.h +++ b/Kernel_d/include/CGAL/Kernel_d/intersection_objectsCd.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_d/include/CGAL/Kernel_d/intersection_objectsHd.h b/Kernel_d/include/CGAL/Kernel_d/intersection_objectsHd.h index e116f903e0e..dc4a4a7e74c 100644 --- a/Kernel_d/include/CGAL/Kernel_d/intersection_objectsHd.h +++ b/Kernel_d/include/CGAL/Kernel_d/intersection_objectsHd.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_d/include/CGAL/Kernel_d/intersection_objects_d.h b/Kernel_d/include/CGAL/Kernel_d/intersection_objects_d.h index 0b9cf6e0086..f976daba137 100644 --- a/Kernel_d/include/CGAL/Kernel_d/intersection_objects_d.h +++ b/Kernel_d/include/CGAL/Kernel_d/intersection_objects_d.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_d/include/CGAL/Kernel_d/simple_objects.h b/Kernel_d/include/CGAL/Kernel_d/simple_objects.h index 987b758caa2..f10b3b65939 100644 --- a/Kernel_d/include/CGAL/Kernel_d/simple_objects.h +++ b/Kernel_d/include/CGAL/Kernel_d/simple_objects.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_d/include/CGAL/Linear_algebraCd.h b/Kernel_d/include/CGAL/Linear_algebraCd.h index d69467fb486..a6412b49eb9 100644 --- a/Kernel_d/include/CGAL/Linear_algebraCd.h +++ b/Kernel_d/include/CGAL/Linear_algebraCd.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_d/include/CGAL/Linear_algebraHd.h b/Kernel_d/include/CGAL/Linear_algebraHd.h index 53e54c07c40..8559860d80a 100644 --- a/Kernel_d/include/CGAL/Linear_algebraHd.h +++ b/Kernel_d/include/CGAL/Linear_algebraHd.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_d/include/CGAL/constructions_d.h b/Kernel_d/include/CGAL/constructions_d.h index 263ff1e9c40..c1f44d5c152 100644 --- a/Kernel_d/include/CGAL/constructions_d.h +++ b/Kernel_d/include/CGAL/constructions_d.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_d/include/CGAL/intersections_d.h b/Kernel_d/include/CGAL/intersections_d.h index 970d19e42bb..477fd38abfb 100644 --- a/Kernel_d/include/CGAL/intersections_d.h +++ b/Kernel_d/include/CGAL/intersections_d.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_d/include/CGAL/predicates_d.h b/Kernel_d/include/CGAL/predicates_d.h index dffddb0773f..48d6e3b9806 100644 --- a/Kernel_d/include/CGAL/predicates_d.h +++ b/Kernel_d/include/CGAL/predicates_d.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_d/include/CGAL/simple_transformations_d.h b/Kernel_d/include/CGAL/simple_transformations_d.h index 7fd8b2d9740..a18903f0768 100644 --- a/Kernel_d/include/CGAL/simple_transformations_d.h +++ b/Kernel_d/include/CGAL/simple_transformations_d.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/demo/Kinetic_data_structures/SoQt_examiner_viewer.cpp b/Kinetic_data_structures/demo/Kinetic_data_structures/SoQt_examiner_viewer.cpp index 381414cc0d1..77f0ee0aa84 100644 --- a/Kinetic_data_structures/demo/Kinetic_data_structures/SoQt_examiner_viewer.cpp +++ b/Kinetic_data_structures/demo/Kinetic_data_structures/SoQt_examiner_viewer.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/demo/Kinetic_data_structures/include/SoQt_examiner_viewer.h b/Kinetic_data_structures/demo/Kinetic_data_structures/include/SoQt_examiner_viewer.h index 08dcb69b5ee..acc6b199c00 100644 --- a/Kinetic_data_structures/demo/Kinetic_data_structures/include/SoQt_examiner_viewer.h +++ b/Kinetic_data_structures/demo/Kinetic_data_structures/include/SoQt_examiner_viewer.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/demo/Kinetic_data_structures/include/SoQt_handle.h b/Kinetic_data_structures/demo/Kinetic_data_structures/include/SoQt_handle.h index d08a2a6c0e8..809ba751d1d 100644 --- a/Kinetic_data_structures/demo/Kinetic_data_structures/include/SoQt_handle.h +++ b/Kinetic_data_structures/demo/Kinetic_data_structures/include/SoQt_handle.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/demo/Kinetic_data_structures/include/SoQt_moving_points_3.h b/Kinetic_data_structures/demo/Kinetic_data_structures/include/SoQt_moving_points_3.h index 51b324af892..83a49fb76e6 100644 --- a/Kinetic_data_structures/demo/Kinetic_data_structures/include/SoQt_moving_points_3.h +++ b/Kinetic_data_structures/demo/Kinetic_data_structures/include/SoQt_moving_points_3.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/demo/Kinetic_data_structures/include/SoQt_moving_weighted_points_3.h b/Kinetic_data_structures/demo/Kinetic_data_structures/include/SoQt_moving_weighted_points_3.h index 83366994f8e..b8a7f1eefff 100644 --- a/Kinetic_data_structures/demo/Kinetic_data_structures/include/SoQt_moving_weighted_points_3.h +++ b/Kinetic_data_structures/demo/Kinetic_data_structures/include/SoQt_moving_weighted_points_3.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/demo/Kinetic_data_structures/include/SoQt_triangulation_3.h b/Kinetic_data_structures/demo/Kinetic_data_structures/include/SoQt_triangulation_3.h index 3e3559eba07..a22defd32eb 100644 --- a/Kinetic_data_structures/demo/Kinetic_data_structures/include/SoQt_triangulation_3.h +++ b/Kinetic_data_structures/demo/Kinetic_data_structures/include/SoQt_triangulation_3.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/demo/Kinetic_data_structures/include/SoQt_widget_3.h b/Kinetic_data_structures/demo/Kinetic_data_structures/include/SoQt_widget_3.h index 3d44b7f6a1a..604c1e64fc4 100644 --- a/Kinetic_data_structures/demo/Kinetic_data_structures/include/SoQt_widget_3.h +++ b/Kinetic_data_structures/demo/Kinetic_data_structures/include/SoQt_widget_3.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/hidden/include/CGAL/Kinetic/Active_objects_set.h b/Kinetic_data_structures/hidden/include/CGAL/Kinetic/Active_objects_set.h index b0e9302064c..f0c10a234da 100644 --- a/Kinetic_data_structures/hidden/include/CGAL/Kinetic/Active_objects_set.h +++ b/Kinetic_data_structures/hidden/include/CGAL/Kinetic/Active_objects_set.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/hidden/include/CGAL/Kinetic/Exact_simulation_traits_1.h b/Kinetic_data_structures/hidden/include/CGAL/Kinetic/Exact_simulation_traits_1.h index 59ffee45327..f2af925ce36 100644 --- a/Kinetic_data_structures/hidden/include/CGAL/Kinetic/Exact_simulation_traits_1.h +++ b/Kinetic_data_structures/hidden/include/CGAL/Kinetic/Exact_simulation_traits_1.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/hidden/include/CGAL/Kinetic/Exact_simulation_traits_2.h b/Kinetic_data_structures/hidden/include/CGAL/Kinetic/Exact_simulation_traits_2.h index d041ba73d08..81959123cfc 100644 --- a/Kinetic_data_structures/hidden/include/CGAL/Kinetic/Exact_simulation_traits_2.h +++ b/Kinetic_data_structures/hidden/include/CGAL/Kinetic/Exact_simulation_traits_2.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/hidden/include/CGAL/Kinetic/Exact_simulation_traits_3.h b/Kinetic_data_structures/hidden/include/CGAL/Kinetic/Exact_simulation_traits_3.h index 9c1cc628132..74cda581fda 100644 --- a/Kinetic_data_structures/hidden/include/CGAL/Kinetic/Exact_simulation_traits_3.h +++ b/Kinetic_data_structures/hidden/include/CGAL/Kinetic/Exact_simulation_traits_3.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/hidden/include/CGAL/Kinetic/Inexact_simulation_traits_1.h b/Kinetic_data_structures/hidden/include/CGAL/Kinetic/Inexact_simulation_traits_1.h index 90781d42e46..a4f6dbc1327 100644 --- a/Kinetic_data_structures/hidden/include/CGAL/Kinetic/Inexact_simulation_traits_1.h +++ b/Kinetic_data_structures/hidden/include/CGAL/Kinetic/Inexact_simulation_traits_1.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/hidden/include/CGAL/Kinetic/Inexact_simulation_traits_2.h b/Kinetic_data_structures/hidden/include/CGAL/Kinetic/Inexact_simulation_traits_2.h index 10adf79c5b6..9bd5bc4a698 100644 --- a/Kinetic_data_structures/hidden/include/CGAL/Kinetic/Inexact_simulation_traits_2.h +++ b/Kinetic_data_structures/hidden/include/CGAL/Kinetic/Inexact_simulation_traits_2.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/hidden/include/CGAL/Kinetic/Inexact_simulation_traits_3.h b/Kinetic_data_structures/hidden/include/CGAL/Kinetic/Inexact_simulation_traits_3.h index 9652c6a6f5b..f7d2d35d484 100644 --- a/Kinetic_data_structures/hidden/include/CGAL/Kinetic/Inexact_simulation_traits_3.h +++ b/Kinetic_data_structures/hidden/include/CGAL/Kinetic/Inexact_simulation_traits_3.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/hidden/include/CGAL/Kinetic/Simulation_traits.h b/Kinetic_data_structures/hidden/include/CGAL/Kinetic/Simulation_traits.h index 9eb69766d79..6aba2626f5f 100644 --- a/Kinetic_data_structures/hidden/include/CGAL/Kinetic/Simulation_traits.h +++ b/Kinetic_data_structures/hidden/include/CGAL/Kinetic/Simulation_traits.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/hidden/include/CGAL/Polynomial/Default_filtering_traits.h b/Kinetic_data_structures/hidden/include/CGAL/Polynomial/Default_filtering_traits.h index 6227b517554..9ddba2d52ce 100644 --- a/Kinetic_data_structures/hidden/include/CGAL/Polynomial/Default_filtering_traits.h +++ b/Kinetic_data_structures/hidden/include/CGAL/Polynomial/Default_filtering_traits.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/hidden/include/CGAL/Polynomial/Filtered_kernel.h b/Kinetic_data_structures/hidden/include/CGAL/Polynomial/Filtered_kernel.h index 09f6e190af3..11a97cb7838 100644 --- a/Kinetic_data_structures/hidden/include/CGAL/Polynomial/Filtered_kernel.h +++ b/Kinetic_data_structures/hidden/include/CGAL/Polynomial/Filtered_kernel.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/hidden/include/CGAL/Polynomial/Lazy_upper_bound_root_stack.h b/Kinetic_data_structures/hidden/include/CGAL/Polynomial/Lazy_upper_bound_root_stack.h index 8625b40d24a..25a4606cfbb 100644 --- a/Kinetic_data_structures/hidden/include/CGAL/Polynomial/Lazy_upper_bound_root_stack.h +++ b/Kinetic_data_structures/hidden/include/CGAL/Polynomial/Lazy_upper_bound_root_stack.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/hidden/include/CGAL/Polynomial/Upper_bound_root_stack.h b/Kinetic_data_structures/hidden/include/CGAL/Polynomial/Upper_bound_root_stack.h index 8d100b83bfb..3e5d3e33c38 100644 --- a/Kinetic_data_structures/hidden/include/CGAL/Polynomial/Upper_bound_root_stack.h +++ b/Kinetic_data_structures/hidden/include/CGAL/Polynomial/Upper_bound_root_stack.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/hidden/include/CGAL/Polynomial/Upper_bound_root_stack_Descartes_traits.h b/Kinetic_data_structures/hidden/include/CGAL/Polynomial/Upper_bound_root_stack_Descartes_traits.h index 8e88a027971..d924bc78c62 100644 --- a/Kinetic_data_structures/hidden/include/CGAL/Polynomial/Upper_bound_root_stack_Descartes_traits.h +++ b/Kinetic_data_structures/hidden/include/CGAL/Polynomial/Upper_bound_root_stack_Descartes_traits.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/hidden/include/CGAL/Polynomial/Upper_bound_root_stack_filtered_Descartes_traits.h b/Kinetic_data_structures/hidden/include/CGAL/Polynomial/Upper_bound_root_stack_filtered_Descartes_traits.h index 264e1469837..332a1586810 100644 --- a/Kinetic_data_structures/hidden/include/CGAL/Polynomial/Upper_bound_root_stack_filtered_Descartes_traits.h +++ b/Kinetic_data_structures/hidden/include/CGAL/Polynomial/Upper_bound_root_stack_filtered_Descartes_traits.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/hidden/include/CGAL/Updatable_Delaunay_triangulation_table_2.h b/Kinetic_data_structures/hidden/include/CGAL/Updatable_Delaunay_triangulation_table_2.h index 91804f08ea3..311fb1f31ff 100644 --- a/Kinetic_data_structures/hidden/include/CGAL/Updatable_Delaunay_triangulation_table_2.h +++ b/Kinetic_data_structures/hidden/include/CGAL/Updatable_Delaunay_triangulation_table_2.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/Active_objects_vector.h b/Kinetic_data_structures/include/CGAL/Kinetic/Active_objects_vector.h index 6e32e26f632..1a075b9129b 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/Active_objects_vector.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/Active_objects_vector.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/CORE_Expr_exact_simulation_traits.h b/Kinetic_data_structures/include/CGAL/Kinetic/CORE_Expr_exact_simulation_traits.h index 11f9c149053..98c1beb523e 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/CORE_Expr_exact_simulation_traits.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/CORE_Expr_exact_simulation_traits.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/Cartesian.h b/Kinetic_data_structures/include/CGAL/Kinetic/Cartesian.h index 166a7f4f3f9..5b1a42b3cb2 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/Cartesian.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/Cartesian.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/Certificate_generator.h b/Kinetic_data_structures/include/CGAL/Kinetic/Certificate_generator.h index 3faa1c851f3..d119d1364c6 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/Certificate_generator.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/Certificate_generator.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/Default_instantaneous_kernel.h b/Kinetic_data_structures/include/CGAL/Kinetic/Default_instantaneous_kernel.h index 9e09f492a10..9cb1f89a18c 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/Default_instantaneous_kernel.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/Default_instantaneous_kernel.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/Default_simulator.h b/Kinetic_data_structures/include/CGAL/Kinetic/Default_simulator.h index 951ece51264..17ed94f6afe 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/Default_simulator.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/Default_simulator.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/Delaunay_triangulation_2.h b/Kinetic_data_structures/include/CGAL/Kinetic/Delaunay_triangulation_2.h index bc1caecf92d..9e97ff30817 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/Delaunay_triangulation_2.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/Delaunay_triangulation_2.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/Delaunay_triangulation_3.h b/Kinetic_data_structures/include/CGAL/Kinetic/Delaunay_triangulation_3.h index 9d7fe1555a7..71e2f601144 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/Delaunay_triangulation_3.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/Delaunay_triangulation_3.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/Delaunay_triangulation_cell_base_3.h b/Kinetic_data_structures/include/CGAL/Kinetic/Delaunay_triangulation_cell_base_3.h index 607a78bf134..25a3db209e3 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/Delaunay_triangulation_cell_base_3.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/Delaunay_triangulation_cell_base_3.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/Delaunay_triangulation_default_traits_2.h b/Kinetic_data_structures/include/CGAL/Kinetic/Delaunay_triangulation_default_traits_2.h index 9e52a097b63..c97f1c65a83 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/Delaunay_triangulation_default_traits_2.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/Delaunay_triangulation_default_traits_2.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/Delaunay_triangulation_event_log_visitor_2.h b/Kinetic_data_structures/include/CGAL/Kinetic/Delaunay_triangulation_event_log_visitor_2.h index aa65942bb2c..82e6e003deb 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/Delaunay_triangulation_event_log_visitor_2.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/Delaunay_triangulation_event_log_visitor_2.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/Delaunay_triangulation_event_log_visitor_3.h b/Kinetic_data_structures/include/CGAL/Kinetic/Delaunay_triangulation_event_log_visitor_3.h index 97dd3bae9f9..f1d28a22c85 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/Delaunay_triangulation_event_log_visitor_3.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/Delaunay_triangulation_event_log_visitor_3.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/Delaunay_triangulation_face_base_2.h b/Kinetic_data_structures/include/CGAL/Kinetic/Delaunay_triangulation_face_base_2.h index 92c3b41c44c..b2d7d8f487e 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/Delaunay_triangulation_face_base_2.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/Delaunay_triangulation_face_base_2.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/Delaunay_triangulation_recent_edges_visitor_2.h b/Kinetic_data_structures/include/CGAL/Kinetic/Delaunay_triangulation_recent_edges_visitor_2.h index d5c9cd9d19e..dc82f3d45a9 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/Delaunay_triangulation_recent_edges_visitor_2.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/Delaunay_triangulation_recent_edges_visitor_2.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/Delaunay_triangulation_vertex_base_2.h b/Kinetic_data_structures/include/CGAL/Kinetic/Delaunay_triangulation_vertex_base_2.h index c328404e377..d2393155a48 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/Delaunay_triangulation_vertex_base_2.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/Delaunay_triangulation_vertex_base_2.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/Delaunay_triangulation_visitor_base_2.h b/Kinetic_data_structures/include/CGAL/Kinetic/Delaunay_triangulation_visitor_base_2.h index a12ae468124..794d226460b 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/Delaunay_triangulation_visitor_base_2.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/Delaunay_triangulation_visitor_base_2.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/Delaunay_triangulation_visitor_base_3.h b/Kinetic_data_structures/include/CGAL/Kinetic/Delaunay_triangulation_visitor_base_3.h index d018debeb34..44179dec5cd 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/Delaunay_triangulation_visitor_base_3.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/Delaunay_triangulation_visitor_base_3.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/Derivitive_filter_function_kernel.h b/Kinetic_data_structures/include/CGAL/Kinetic/Derivitive_filter_function_kernel.h index 66576baafb2..2d513a8e3e0 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/Derivitive_filter_function_kernel.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/Derivitive_filter_function_kernel.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/Enclosing_box_2.h b/Kinetic_data_structures/include/CGAL/Kinetic/Enclosing_box_2.h index cab5cb42552..6bd8a766185 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/Enclosing_box_2.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/Enclosing_box_2.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/Enclosing_box_3.h b/Kinetic_data_structures/include/CGAL/Kinetic/Enclosing_box_3.h index bd5c89e9451..f6022f704ab 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/Enclosing_box_3.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/Enclosing_box_3.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/Erase_event.h b/Kinetic_data_structures/include/CGAL/Kinetic/Erase_event.h index 10d656ea9af..a7627df1eff 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/Erase_event.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/Erase_event.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/Event_base.h b/Kinetic_data_structures/include/CGAL/Kinetic/Event_base.h index 0f880e8b1eb..b43fd751346 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/Event_base.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/Event_base.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/Exact_simulation_traits.h b/Kinetic_data_structures/include/CGAL/Kinetic/Exact_simulation_traits.h index b0a7b7140c7..62c482cc84f 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/Exact_simulation_traits.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/Exact_simulation_traits.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/Free_event_base.h b/Kinetic_data_structures/include/CGAL/Kinetic/Free_event_base.h index 82938459913..444241df3ba 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/Free_event_base.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/Free_event_base.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/Handle_degeneracy_function_kernel.h b/Kinetic_data_structures/include/CGAL/Kinetic/Handle_degeneracy_function_kernel.h index b4b940ccf09..3e1dc8da996 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/Handle_degeneracy_function_kernel.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/Handle_degeneracy_function_kernel.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/Heap_pointer_event_queue.h b/Kinetic_data_structures/include/CGAL/Kinetic/Heap_pointer_event_queue.h index b47e2e2ed71..8e4e6a149af 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/Heap_pointer_event_queue.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/Heap_pointer_event_queue.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/IO/Qt_moving_points_2.h b/Kinetic_data_structures/include/CGAL/Kinetic/IO/Qt_moving_points_2.h index 517e050f58e..c21dea456ba 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/IO/Qt_moving_points_2.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/IO/Qt_moving_points_2.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/IO/Qt_triangulation_2.h b/Kinetic_data_structures/include/CGAL/Kinetic/IO/Qt_triangulation_2.h index bbe593794f1..bba7dae63d2 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/IO/Qt_triangulation_2.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/IO/Qt_triangulation_2.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/IO/Qt_widget_2.h b/Kinetic_data_structures/include/CGAL/Kinetic/IO/Qt_widget_2.h index 07ce74a35f1..689799dbaf7 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/IO/Qt_widget_2.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/IO/Qt_widget_2.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/GUI_base.h b/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/GUI_base.h index 34d5c7375e0..01387fc1c41 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/GUI_base.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/GUI_base.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Qt_core.h b/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Qt_core.h index 43acf9241cc..18550910bfc 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Qt_core.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Qt_core.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Qt_timer.h b/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Qt_timer.h index 513d0e59f3a..b4bc714e2bd 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Qt_timer.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Qt_timer.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Qt_widget_2_core.h b/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Qt_widget_2_core.h index 2003550d605..f04f56c1126 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Qt_widget_2_core.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Qt_widget_2_core.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Qt_window_2.h b/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Qt_window_2.h index f8e79b096d1..4fd60fe4d78 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Qt_window_2.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Qt_window_2.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/pixmaps.h b/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/pixmaps.h index a66f979b156..6cafaa1dc2d 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/pixmaps.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/pixmaps.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/Inexact_simulation_traits.h b/Kinetic_data_structures/include/CGAL/Kinetic/Inexact_simulation_traits.h index 526e4041f86..3606f5170ec 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/Inexact_simulation_traits.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/Inexact_simulation_traits.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/Insert_event.h b/Kinetic_data_structures/include/CGAL/Kinetic/Insert_event.h index e13241212a4..28e321e13eb 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/Insert_event.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/Insert_event.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/Listener.h b/Kinetic_data_structures/include/CGAL/Kinetic/Listener.h index 3cc5293b139..03dc2828996 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/Listener.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/Listener.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/Multi_listener.h b/Kinetic_data_structures/include/CGAL/Kinetic/Multi_listener.h index 8d3e0a63927..36280c66b78 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/Multi_listener.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/Multi_listener.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/Ref_counted.h b/Kinetic_data_structures/include/CGAL/Kinetic/Ref_counted.h index 9d7c550d4ba..efe97a32118 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/Ref_counted.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/Ref_counted.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/Regular_triangulation_3.h b/Kinetic_data_structures/include/CGAL/Kinetic/Regular_triangulation_3.h index 6f67b0dac62..03fe6180b21 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/Regular_triangulation_3.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/Regular_triangulation_3.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/Regular_triangulation_CORE_exact_simulation_traits.h b/Kinetic_data_structures/include/CGAL/Kinetic/Regular_triangulation_CORE_exact_simulation_traits.h index a636cadcc10..b86b200a5b1 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/Regular_triangulation_CORE_exact_simulation_traits.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/Regular_triangulation_CORE_exact_simulation_traits.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/Regular_triangulation_cell_base_3.h b/Kinetic_data_structures/include/CGAL/Kinetic/Regular_triangulation_cell_base_3.h index 93b0c8724c9..deeb3f4464f 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/Regular_triangulation_cell_base_3.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/Regular_triangulation_cell_base_3.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/Regular_triangulation_event_log_visitor_3.h b/Kinetic_data_structures/include/CGAL/Kinetic/Regular_triangulation_event_log_visitor_3.h index c2d83bf012d..e2d9e538b70 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/Regular_triangulation_event_log_visitor_3.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/Regular_triangulation_event_log_visitor_3.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/Regular_triangulation_exact_simulation_traits.h b/Kinetic_data_structures/include/CGAL/Kinetic/Regular_triangulation_exact_simulation_traits.h index eb93d4a844f..2a961f0c91d 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/Regular_triangulation_exact_simulation_traits.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/Regular_triangulation_exact_simulation_traits.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/Regular_triangulation_inexact_simulation_traits.h b/Kinetic_data_structures/include/CGAL/Kinetic/Regular_triangulation_inexact_simulation_traits.h index e4241c1734f..21fa99365ad 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/Regular_triangulation_inexact_simulation_traits.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/Regular_triangulation_inexact_simulation_traits.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/Regular_triangulation_instantaneous_kernel.h b/Kinetic_data_structures/include/CGAL/Kinetic/Regular_triangulation_instantaneous_kernel.h index f2f1b9bc2b1..f058ad39673 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/Regular_triangulation_instantaneous_kernel.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/Regular_triangulation_instantaneous_kernel.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/Regular_triangulation_vertex_base_3.h b/Kinetic_data_structures/include/CGAL/Kinetic/Regular_triangulation_vertex_base_3.h index 2ad8ac6f706..9e929c53dcf 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/Regular_triangulation_vertex_base_3.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/Regular_triangulation_vertex_base_3.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/Regular_triangulation_visitor_base_3.h b/Kinetic_data_structures/include/CGAL/Kinetic/Regular_triangulation_visitor_base_3.h index 6c0dcbc1941..f8f4699cc6c 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/Regular_triangulation_visitor_base_3.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/Regular_triangulation_visitor_base_3.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/Simulator_objects_listener.h b/Kinetic_data_structures/include/CGAL/Kinetic/Simulator_objects_listener.h index 6e188e19ac7..987ba8c2d1c 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/Simulator_objects_listener.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/Simulator_objects_listener.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/Sort.h b/Kinetic_data_structures/include/CGAL/Kinetic/Sort.h index d8d18747227..dd4a286f16a 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/Sort.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/Sort.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/Sort_event_log_visitor.h b/Kinetic_data_structures/include/CGAL/Kinetic/Sort_event_log_visitor.h index e5dc212175f..7cdc4298f5b 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/Sort_event_log_visitor.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/Sort_event_log_visitor.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/Sort_visitor_base.h b/Kinetic_data_structures/include/CGAL/Kinetic/Sort_visitor_base.h index 1d5235522f2..78d0a33d7c7 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/Sort_visitor_base.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/Sort_visitor_base.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/Triangulation_2.h b/Kinetic_data_structures/include/CGAL/Kinetic/Triangulation_2.h index 9ea35d49916..6459da87bec 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/Triangulation_2.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/Triangulation_2.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/Two_list_pointer_event_queue.h b/Kinetic_data_structures/include/CGAL/Kinetic/Two_list_pointer_event_queue.h index f282abb4e11..f100145553c 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/Two_list_pointer_event_queue.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/Two_list_pointer_event_queue.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/basic.h b/Kinetic_data_structures/include/CGAL/Kinetic/basic.h index d79a6c782f6..894de959d48 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/basic.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/basic.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/internal/Delaunay_triangulation_base_3.h b/Kinetic_data_structures/include/CGAL/Kinetic/internal/Delaunay_triangulation_base_3.h index cff0ceaf7b8..6b8c9242488 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/internal/Delaunay_triangulation_base_3.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/internal/Delaunay_triangulation_base_3.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/internal/Instantaneous_adaptor.h b/Kinetic_data_structures/include/CGAL/Kinetic/internal/Instantaneous_adaptor.h index cd386403eb3..bae0f89e599 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/internal/Instantaneous_adaptor.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/internal/Instantaneous_adaptor.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/internal/Kernel/Cartesian_kinetic_kernel_base.h b/Kinetic_data_structures/include/CGAL/Kinetic/internal/Kernel/Cartesian_kinetic_kernel_base.h index ec5d39bc878..78101fb9cd2 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/internal/Kernel/Cartesian_kinetic_kernel_base.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/internal/Kernel/Cartesian_kinetic_kernel_base.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/internal/Kernel/Cartesian_moving_lifted_point_3.h b/Kinetic_data_structures/include/CGAL/Kinetic/internal/Kernel/Cartesian_moving_lifted_point_3.h index e4ffc36e7bf..a47f94bf498 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/internal/Kernel/Cartesian_moving_lifted_point_3.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/internal/Kernel/Cartesian_moving_lifted_point_3.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/internal/Kernel/Cartesian_moving_orthosphere_3.h b/Kinetic_data_structures/include/CGAL/Kinetic/internal/Kernel/Cartesian_moving_orthosphere_3.h index b2ca8d09c24..87e09944c4f 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/internal/Kernel/Cartesian_moving_orthosphere_3.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/internal/Kernel/Cartesian_moving_orthosphere_3.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/internal/Kernel/Cartesian_moving_point_1.h b/Kinetic_data_structures/include/CGAL/Kinetic/internal/Kernel/Cartesian_moving_point_1.h index ccd7c0b5a52..e0d701159ec 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/internal/Kernel/Cartesian_moving_point_1.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/internal/Kernel/Cartesian_moving_point_1.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/internal/Kernel/Cartesian_moving_point_2.h b/Kinetic_data_structures/include/CGAL/Kinetic/internal/Kernel/Cartesian_moving_point_2.h index 11f4ca42645..b86a8abea5b 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/internal/Kernel/Cartesian_moving_point_2.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/internal/Kernel/Cartesian_moving_point_2.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/internal/Kernel/Cartesian_moving_point_3.h b/Kinetic_data_structures/include/CGAL/Kinetic/internal/Kernel/Cartesian_moving_point_3.h index e7d01ae251a..22d023a9c3f 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/internal/Kernel/Cartesian_moving_point_3.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/internal/Kernel/Cartesian_moving_point_3.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/internal/Kernel/Cartesian_moving_weighted_point_3.h b/Kinetic_data_structures/include/CGAL/Kinetic/internal/Kernel/Cartesian_moving_weighted_point_3.h index dff74acbd8b..b09f78a99ae 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/internal/Kernel/Cartesian_moving_weighted_point_3.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/internal/Kernel/Cartesian_moving_weighted_point_3.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/internal/Kernel/Center.h b/Kinetic_data_structures/include/CGAL/Kinetic/internal/Kernel/Center.h index 0a8f837773a..aa750ac8c05 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/internal/Kernel/Center.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/internal/Kernel/Center.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/internal/Kernel/Certificate.h b/Kinetic_data_structures/include/CGAL/Kinetic/internal/Kernel/Certificate.h index 5ffa204c42e..6fc05f72800 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/internal/Kernel/Certificate.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/internal/Kernel/Certificate.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/internal/Kernel/Delaunay_lifted_lifting.h b/Kinetic_data_structures/include/CGAL/Kinetic/internal/Kernel/Delaunay_lifted_lifting.h index 9d8ad8ed608..11d037193cb 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/internal/Kernel/Delaunay_lifted_lifting.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/internal/Kernel/Delaunay_lifted_lifting.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/internal/Kernel/Delaunay_lifting.h b/Kinetic_data_structures/include/CGAL/Kinetic/internal/Kernel/Delaunay_lifting.h index 37c20263d37..54b64af8223 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/internal/Kernel/Delaunay_lifting.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/internal/Kernel/Delaunay_lifting.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/internal/Kernel/Reverse_time.h b/Kinetic_data_structures/include/CGAL/Kinetic/internal/Kernel/Reverse_time.h index a8fc1c47c33..6cc85397c4c 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/internal/Kernel/Reverse_time.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/internal/Kernel/Reverse_time.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/internal/Kernel/cartesian_predicates_2.h b/Kinetic_data_structures/include/CGAL/Kinetic/internal/Kernel/cartesian_predicates_2.h index 3286705fcf7..5b092cf2e05 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/internal/Kernel/cartesian_predicates_2.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/internal/Kernel/cartesian_predicates_2.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/internal/Kernel/cartesian_predicates_3.h b/Kinetic_data_structures/include/CGAL/Kinetic/internal/Kernel/cartesian_predicates_3.h index 4e620acad16..14f9deb8f57 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/internal/Kernel/cartesian_predicates_3.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/internal/Kernel/cartesian_predicates_3.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/internal/To_static.h b/Kinetic_data_structures/include/CGAL/Kinetic/internal/To_static.h index 3f621d54803..563e919654c 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/internal/To_static.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/internal/To_static.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/internal/Triangulation_helper_3.h b/Kinetic_data_structures/include/CGAL/Kinetic/internal/Triangulation_helper_3.h index d18ea4fe52f..f10ac94a845 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/internal/Triangulation_helper_3.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/internal/Triangulation_helper_3.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/internal/config.h b/Kinetic_data_structures/include/CGAL/Kinetic/internal/config.h index c9acaa3af9a..c106474d205 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/internal/config.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/internal/config.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/internal/debug_counters.h b/Kinetic_data_structures/include/CGAL/Kinetic/internal/debug_counters.h index 5e9ed05c563..d03f1e0a9a2 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/internal/debug_counters.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/internal/debug_counters.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/internal/infinity_or_max.h b/Kinetic_data_structures/include/CGAL/Kinetic/internal/infinity_or_max.h index 47fbf67723d..74ceb43cb7d 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/internal/infinity_or_max.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/internal/infinity_or_max.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/internal/tds_2_helpers.h b/Kinetic_data_structures/include/CGAL/Kinetic/internal/tds_2_helpers.h index a44aec4dcbb..d50c4808470 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/internal/tds_2_helpers.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/internal/tds_2_helpers.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/internal/triangulation_helpers_3.h b/Kinetic_data_structures/include/CGAL/Kinetic/internal/triangulation_helpers_3.h index 6959555d98e..07b3064af8a 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/internal/triangulation_helpers_3.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/internal/triangulation_helpers_3.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/listeners.h b/Kinetic_data_structures/include/CGAL/Kinetic/listeners.h index 461fabc9213..a200e68d494 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/listeners.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/listeners.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/CORE_Expr_root_stack.h b/Kinetic_data_structures/include/CGAL/Polynomial/CORE_Expr_root_stack.h index f116ced99f1..875b942d419 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/CORE_Expr_root_stack.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/CORE_Expr_root_stack.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/CORE_kernel.h b/Kinetic_data_structures/include/CGAL/Polynomial/CORE_kernel.h index 1d77a7fd233..b3c37ff236d 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/CORE_kernel.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/CORE_kernel.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/Fixed_polynomial.h b/Kinetic_data_structures/include/CGAL/Polynomial/Fixed_polynomial.h index dfeba72628f..ef030cb237a 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/Fixed_polynomial.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/Fixed_polynomial.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/Interval_polynomial.h b/Kinetic_data_structures/include/CGAL/Polynomial/Interval_polynomial.h index 72cad0df6e9..ae024ba0dd7 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/Interval_polynomial.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/Interval_polynomial.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/Kernel.h b/Kinetic_data_structures/include/CGAL/Polynomial/Kernel.h index 2ab7648319f..83cb4b995e5 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/Kernel.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/Kernel.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/Numeric_root_stack.h b/Kinetic_data_structures/include/CGAL/Polynomial/Numeric_root_stack.h index 66d30ec69eb..21c82e6a49c 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/Numeric_root_stack.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/Numeric_root_stack.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/Polynomial.h b/Kinetic_data_structures/include/CGAL/Polynomial/Polynomial.h index 4601a92d253..7f1830da4c9 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/Polynomial.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/Polynomial.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/Root_stack_default_traits.h b/Kinetic_data_structures/include/CGAL/Polynomial/Root_stack_default_traits.h index 4d2b9d29477..29998d02d55 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/Root_stack_default_traits.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/Root_stack_default_traits.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/Sturm_root_stack.h b/Kinetic_data_structures/include/CGAL/Polynomial/Sturm_root_stack.h index fb37e709cf9..a3f97ed849e 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/Sturm_root_stack.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/Sturm_root_stack.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/Sturm_root_stack_traits.h b/Kinetic_data_structures/include/CGAL/Polynomial/Sturm_root_stack_traits.h index 1c17f8a2d94..fa98ecef14b 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/Sturm_root_stack_traits.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/Sturm_root_stack_traits.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/basic.h b/Kinetic_data_structures/include/CGAL/Polynomial/basic.h index 52c9dee5f0c..8159a6f87ba 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/basic.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/basic.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Alternation_counter.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Alternation_counter.h index 75b6fbc3277..61e7c99af34 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Alternation_counter.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Alternation_counter.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/CORE_polynomial.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/CORE_polynomial.h index 579e90a434a..fb3616f4b43 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/CORE_polynomial.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/CORE_polynomial.h @@ -1,5 +1,5 @@ -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Descartes_root_count.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Descartes_root_count.h index 4cfb17c7ced..ab6437f569e 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Descartes_root_count.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Descartes_root_count.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Double_with_infinity.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Double_with_infinity.h index 60ec5148406..0a9d8a608cd 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Double_with_infinity.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Double_with_infinity.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_function.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_function.h index 6c40b2b2bd5..438e0f9fdca 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_function.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_function.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_kernel.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_kernel.h index c9523cc53e3..749cae97a72 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_kernel.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_kernel.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_kernel/Filtered_Descartes_has_root.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_kernel/Filtered_Descartes_has_root.h index d80aa55a176..199e6923e25 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_kernel/Filtered_Descartes_has_root.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_kernel/Filtered_Descartes_has_root.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_kernel/Filtered_Descartes_root_counter.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_kernel/Filtered_Descartes_root_counter.h index 2d9387d84f9..4d3d684095d 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_kernel/Filtered_Descartes_root_counter.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_kernel/Filtered_Descartes_root_counter.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_kernel/Filtered_are_negations.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_kernel/Filtered_are_negations.h index 4d714c410d5..394dd601fef 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_kernel/Filtered_are_negations.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_kernel/Filtered_are_negations.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_kernel/Filtered_polynomial_rational_kernel.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_kernel/Filtered_polynomial_rational_kernel.h index 79b1a2785fa..b8335ff0054 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_kernel/Filtered_polynomial_rational_kernel.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_kernel/Filtered_polynomial_rational_kernel.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_kernel/Filtered_root_bound_evaluator.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_kernel/Filtered_root_bound_evaluator.h index 5b0fc710784..b71047bc345 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_kernel/Filtered_root_bound_evaluator.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_kernel/Filtered_root_bound_evaluator.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_kernel/Filtered_root_multiplicity.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_kernel/Filtered_root_multiplicity.h index a8728b3ca10..decdfab8713 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_kernel/Filtered_root_multiplicity.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_kernel/Filtered_root_multiplicity.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_kernel/Filtered_sign_at.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_kernel/Filtered_sign_at.h index f0227d0edfe..2a6c7d02723 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_kernel/Filtered_sign_at.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_kernel/Filtered_sign_at.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_number.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_number.h index f5b7f8353ef..cc124a81817 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_number.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_number.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_rational/Construct_filtered_function.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_rational/Construct_filtered_function.h index 428b39c5c71..a5a04d87892 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_rational/Construct_filtered_function.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_rational/Construct_filtered_function.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_rational/Filtered_Descartes_has_root.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_rational/Filtered_Descartes_has_root.h index 38d063ba3c6..5fc4028bde4 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_rational/Filtered_Descartes_has_root.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_rational/Filtered_Descartes_has_root.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_rational/Filtered_Descartes_root_counter.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_rational/Filtered_Descartes_root_counter.h index b027590602c..ed242553da4 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_rational/Filtered_Descartes_root_counter.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_rational/Filtered_Descartes_root_counter.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_rational/Filtered_Sturm_sequence.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_rational/Filtered_Sturm_sequence.h index d0e1bdf6c86..72ba4aa3e67 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_rational/Filtered_Sturm_sequence.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_rational/Filtered_Sturm_sequence.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_rational/Filtered_are_negations.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_rational/Filtered_are_negations.h index 901d532f84d..21fd56f2f8a 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_rational/Filtered_are_negations.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_rational/Filtered_are_negations.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_rational/Filtered_rational_multiplicity.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_rational/Filtered_rational_multiplicity.h index 49f8784a3fb..03186fc01dd 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_rational/Filtered_rational_multiplicity.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_rational/Filtered_rational_multiplicity.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_rational/Filtered_rational_sign_above_rational.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_rational/Filtered_rational_sign_above_rational.h index bc81708d09e..f2e6b8df710 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_rational/Filtered_rational_sign_above_rational.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_rational/Filtered_rational_sign_above_rational.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_rational/Filtered_rational_traits.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_rational/Filtered_rational_traits.h index 655a164c77f..7819245725e 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_rational/Filtered_rational_traits.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_rational/Filtered_rational_traits.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_rational/Filtered_root_bound_evaluator.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_rational/Filtered_root_bound_evaluator.h index 6f1a7c8cb54..bc2bf12375a 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_rational/Filtered_root_bound_evaluator.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_rational/Filtered_root_bound_evaluator.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_rational/Filtered_sign_Sturm_sequence.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_rational/Filtered_sign_Sturm_sequence.h index 764f702fd57..9f9f733b30b 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_rational/Filtered_sign_Sturm_sequence.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_rational/Filtered_sign_Sturm_sequence.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_rational/Filtered_sign_at_rational.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_rational/Filtered_sign_at_rational.h index ca675992876..c21c57b053c 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_rational/Filtered_sign_at_rational.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_rational/Filtered_sign_at_rational.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_rational/Filtered_standard_sequence.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_rational/Filtered_standard_sequence.h index 777512b3795..91634d1365c 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_rational/Filtered_standard_sequence.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_rational/Filtered_standard_sequence.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Fixed_polynomial_impl.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Fixed_polynomial_impl.h index de95efc45d5..b57d134afa0 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Fixed_polynomial_impl.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Fixed_polynomial_impl.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/GSL_numeric_solver.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/GSL_numeric_solver.h index 74dcd3acd1f..8b052d92437 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/GSL_numeric_solver.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/GSL_numeric_solver.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Isolating_interval.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Isolating_interval.h index 8dc27770a72..821dd4ccec9 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Isolating_interval.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Isolating_interval.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Kernel/Is_even_multiplicity.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Kernel/Is_even_multiplicity.h index df3805b4aa6..a0514333dc7 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Kernel/Is_even_multiplicity.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Kernel/Is_even_multiplicity.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Kernel/Is_rational.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Kernel/Is_rational.h index 794512cbb30..fb3baef5e5c 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Kernel/Is_rational.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Kernel/Is_rational.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Kernel/Isolating_interval.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Kernel/Isolating_interval.h index e9fcab7bb15..f7cb5f9880a 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Kernel/Isolating_interval.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Kernel/Isolating_interval.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Kernel/Lower_bound_root.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Kernel/Lower_bound_root.h index dbd7f2651aa..36c4e987523 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Kernel/Lower_bound_root.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Kernel/Lower_bound_root.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Kernel/Multiplicity.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Kernel/Multiplicity.h index 00e55925078..e51847396ae 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Kernel/Multiplicity.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Kernel/Multiplicity.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Kernel/Rational_between_roots.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Kernel/Rational_between_roots.h index f82c7df23fc..c08adafda20 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Kernel/Rational_between_roots.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Kernel/Rational_between_roots.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Kernel/Root_container.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Kernel/Root_container.h index 811f59bed2b..a1f917b8af6 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Kernel/Root_container.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Kernel/Root_container.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Kernel/Sign_above.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Kernel/Sign_above.h index b0a1d47b4f6..482ed5a9a57 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Kernel/Sign_above.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Kernel/Sign_above.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Kernel/Sign_at.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Kernel/Sign_at.h index ff0d59ea8ee..b7f0d70e9df 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Kernel/Sign_at.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Kernel/Sign_at.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Kernel/Sign_below.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Kernel/Sign_below.h index 6aa3d31a5f3..218d6e09d02 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Kernel/Sign_below.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Kernel/Sign_below.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Kernel/Sign_between_roots.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Kernel/Sign_between_roots.h index 6cbfe1ae690..61a93823412 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Kernel/Sign_between_roots.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Kernel/Sign_between_roots.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Kernel/To_rational.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Kernel/To_rational.h index cc9cca22488..deec1617ec1 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Kernel/To_rational.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Kernel/To_rational.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Kernel/predicate_template.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Kernel/predicate_template.h index dcbb2b1a3a0..2f05698eb63 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Kernel/predicate_template.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Kernel/predicate_template.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Polynomial_impl.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Polynomial_impl.h index 1b8e24946df..9263fb1d456 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Polynomial_impl.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Polynomial_impl.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Are_negations.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Are_negations.h index d2a9820e600..48430848206 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Are_negations.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Are_negations.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Bezier_root_counter.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Bezier_root_counter.h index 6015376d254..1ca02f095c0 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Bezier_root_counter.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Bezier_root_counter.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Compare_isolated_roots_in_interval.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Compare_isolated_roots_in_interval.h index fb6fcba1ef6..1cc86e3d08f 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Compare_isolated_roots_in_interval.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Compare_isolated_roots_in_interval.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Construct_function.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Construct_function.h index 25f4c97b5b9..388d119be56 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Construct_function.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Construct_function.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Derivative.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Derivative.h index 0f8c3a8461d..46e8b1a6263 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Derivative.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Derivative.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Descartes_has_root.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Descartes_has_root.h index f7a370b6b38..68b1f139ab4 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Descartes_has_root.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Descartes_has_root.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Descartes_root_counter.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Descartes_root_counter.h index 2916abd6eb1..12c655dcec9 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Descartes_root_counter.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Descartes_root_counter.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Euclidean_Sturm_sequence.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Euclidean_Sturm_sequence.h index 025f901f56a..f1fd38be5d4 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Euclidean_Sturm_sequence.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Euclidean_Sturm_sequence.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Evaluate_polynomial.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Evaluate_polynomial.h index c8285938efc..253bbf9d85b 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Evaluate_polynomial.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Evaluate_polynomial.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Invert_variable.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Invert_variable.h index b9f1acd7739..f1aa58eb7b8 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Invert_variable.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Invert_variable.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Map_rational_interval_to_positive.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Map_rational_interval_to_positive.h index d3bd70fd37e..d669bbc0c89 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Map_rational_interval_to_positive.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Map_rational_interval_to_positive.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Monic_Sturm_sequence.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Monic_Sturm_sequence.h index 17265afb2a2..d68e43ac3db 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Monic_Sturm_sequence.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Monic_Sturm_sequence.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Negate_variable.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Negate_variable.h index a7b1927ad85..59e60588802 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Negate_variable.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Negate_variable.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Primitive_part_Sturm_sequence.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Primitive_part_Sturm_sequence.h index 4678acf467a..32a579a01c1 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Primitive_part_Sturm_sequence.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Primitive_part_Sturm_sequence.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Pseudo_quotient.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Pseudo_quotient.h index f11cbe8d20c..73d644e98d0 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Pseudo_quotient.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Pseudo_quotient.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Pseudo_remainder.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Pseudo_remainder.h index 60b7e55190d..c4d99814989 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Pseudo_remainder.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Pseudo_remainder.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Quotient.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Quotient.h index 2444dc684c4..3c3f1c8f838 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Quotient.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Quotient.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Quotient_remainder.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Quotient_remainder.h index bf8bf18ad40..bb11a30ef95 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Quotient_remainder.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Quotient_remainder.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Rational_multiplicity.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Rational_multiplicity.h index 68de94d05ef..455d5a58758 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Rational_multiplicity.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Rational_multiplicity.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Rational_traits_base.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Rational_traits_base.h index ae973e2c23f..8a1ae5b9e05 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Rational_traits_base.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Rational_traits_base.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Rational_translate_zero.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Rational_translate_zero.h index 4f8bfbd34cd..42c088316d9 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Rational_translate_zero.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Rational_translate_zero.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Reduced_Sturm_sequence.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Reduced_Sturm_sequence.h index 5cd669b18c3..5a3c42b4c9e 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Reduced_Sturm_sequence.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Reduced_Sturm_sequence.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Remainder.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Remainder.h index c8ecbfaaea9..2d6b2ec38f6 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Remainder.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Remainder.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Root_bound_evaluator.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Root_bound_evaluator.h index 0b9c8ad5bda..9c157389d03 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Root_bound_evaluator.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Root_bound_evaluator.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Shift_power.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Shift_power.h index 90077d5ba9b..6f14f97581d 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Shift_power.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Shift_power.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Sign_Sturm_sequence.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Sign_Sturm_sequence.h index a15ede17c63..28d6103867c 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Sign_Sturm_sequence.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Sign_Sturm_sequence.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Sign_above_rational.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Sign_above_rational.h index a83f3d5804a..40c169566ac 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Sign_above_rational.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Sign_above_rational.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Sign_at_rational.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Sign_at_rational.h index 2cc8942c955..45dc386c631 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Sign_at_rational.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Sign_at_rational.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Sign_below_rational.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Sign_below_rational.h index 3e42fa2b3cf..1de8c6987f8 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Sign_below_rational.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Sign_below_rational.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Standard_sequence.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Standard_sequence.h index 5ce244f5078..98f7a353723 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Standard_sequence.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Standard_sequence.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Sturm_root_counter.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Sturm_root_counter.h index 79bb96f30e8..99b0b123ed6 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Sturm_root_counter.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Sturm_root_counter.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Sturm_sequence.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Sturm_sequence.h index 02053bb1058..694d9e10a8d 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Sturm_sequence.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Sturm_sequence.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Sturm_sequence_base.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Sturm_sequence_base.h index 721822e2ac5..eee91215dca 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Sturm_sequence_base.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Sturm_sequence_base.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Subresultant_Sturm_sequence.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Subresultant_Sturm_sequence.h index 1190c4380cd..3da7c28fb8b 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Subresultant_Sturm_sequence.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Subresultant_Sturm_sequence.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Root_stack_traits_base.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Root_stack_traits_base.h index 6e94209ed10..5c4275bb21e 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Root_stack_traits_base.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Root_stack_traits_base.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Sign_variations_counter.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Sign_variations_counter.h index 8e3624f87b2..1d9a70574ed 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Sign_variations_counter.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Sign_variations_counter.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Simple_interval_root.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Simple_interval_root.h index 21554ef670a..d27668d85c1 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Simple_interval_root.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Simple_interval_root.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Statistics.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Statistics.h index 2487f8fd34b..f9d8110dac3 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Statistics.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Statistics.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Sturm_isolating_interval.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Sturm_isolating_interval.h index 49350597d4f..959a73bf73b 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Sturm_isolating_interval.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Sturm_isolating_interval.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Sturm_root_rep.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Sturm_root_rep.h index e3b2d798ead..05f12b4df90 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Sturm_root_rep.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Sturm_root_rep.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/config.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/config.h index 34e578fa642..86fad21f72c 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/config.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/config.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/filtered_function_leaf_nodes.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/filtered_function_leaf_nodes.h index 43cbe4bd929..be5a845d2f4 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/filtered_function_leaf_nodes.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/filtered_function_leaf_nodes.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/filtered_function_node_bases.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/filtered_function_node_bases.h index bcd9afa01ea..c97b97bc78d 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/filtered_function_node_bases.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/filtered_function_node_bases.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/filtered_function_operation_nodes.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/filtered_function_operation_nodes.h index c44d75bc956..fd4ddb715b4 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/filtered_function_operation_nodes.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/filtered_function_operation_nodes.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/interval_arithmetic.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/interval_arithmetic.h index b25b48cbf84..697e6fe8dc4 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/interval_arithmetic.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/interval_arithmetic.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/macros.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/macros.h index c9442b48b9e..8cb7c188591 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/macros.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/macros.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/nt_converters.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/nt_converters.h index b7fbd4f3a65..d1d17556f80 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/nt_converters.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/nt_converters.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/numeric_solvers.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/numeric_solvers.h index f558c98879a..6c805fd42a5 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/numeric_solvers.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/numeric_solvers.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/numeric_solvers_support.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/numeric_solvers_support.h index a98847a99db..b5e4e03e049 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/numeric_solvers_support.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/numeric_solvers_support.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/polynomial_generators.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/polynomial_generators.h index 2c6f2b6372a..4e08fa55fed 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/polynomial_generators.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/polynomial_generators.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/polynomial_converters.h b/Kinetic_data_structures/include/CGAL/Polynomial/polynomial_converters.h index 92f4338a0f9..60ef15e1d57 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/polynomial_converters.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/polynomial_converters.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Tools/Counter.h b/Kinetic_data_structures/include/CGAL/Tools/Counter.h index 5b33ceb0ce9..694cf601498 100644 --- a/Kinetic_data_structures/include/CGAL/Tools/Counter.h +++ b/Kinetic_data_structures/include/CGAL/Tools/Counter.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Tools/Label.h b/Kinetic_data_structures/include/CGAL/Tools/Label.h index d8300b2aecf..fd4e1a93a02 100644 --- a/Kinetic_data_structures/include/CGAL/Tools/Label.h +++ b/Kinetic_data_structures/include/CGAL/Tools/Label.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Tools/Log.h b/Kinetic_data_structures/include/CGAL/Tools/Log.h index c7f329fea03..0d822ace593 100644 --- a/Kinetic_data_structures/include/CGAL/Tools/Log.h +++ b/Kinetic_data_structures/include/CGAL/Tools/Log.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/include/CGAL/Tools/utility_macros.h b/Kinetic_data_structures/include/CGAL/Tools/utility_macros.h index f61901ced12..538b0fbb7fc 100644 --- a/Kinetic_data_structures/include/CGAL/Tools/utility_macros.h +++ b/Kinetic_data_structures/include/CGAL/Tools/utility_macros.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/src/CGAL/JAMA_numeric_solver.cpp b/Kinetic_data_structures/src/CGAL/JAMA_numeric_solver.cpp index 4d451d50ea0..b48ca2710c9 100644 --- a/Kinetic_data_structures/src/CGAL/JAMA_numeric_solver.cpp +++ b/Kinetic_data_structures/src/CGAL/JAMA_numeric_solver.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/src/CGAL/KDS_Log.cpp b/Kinetic_data_structures/src/CGAL/KDS_Log.cpp index 4063307eff6..383c6240f17 100644 --- a/Kinetic_data_structures/src/CGAL/KDS_Log.cpp +++ b/Kinetic_data_structures/src/CGAL/KDS_Log.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/src/CGAL/Turkowski_numeric_solver.cpp b/Kinetic_data_structures/src/CGAL/Turkowski_numeric_solver.cpp index eeb35ab5f7a..14cca5981d7 100644 --- a/Kinetic_data_structures/src/CGAL/Turkowski_numeric_solver.cpp +++ b/Kinetic_data_structures/src/CGAL/Turkowski_numeric_solver.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/src/CGAL/numeric_solvers_support.cpp b/Kinetic_data_structures/src/CGAL/numeric_solvers_support.cpp index 1c7909fe705..1616cb6ee52 100644 --- a/Kinetic_data_structures/src/CGAL/numeric_solvers_support.cpp +++ b/Kinetic_data_structures/src/CGAL/numeric_solvers_support.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/src/CGALQt3/Kinetic_Qt_core.cpp b/Kinetic_data_structures/src/CGALQt3/Kinetic_Qt_core.cpp index 73c77c3aacf..01705135e0b 100644 --- a/Kinetic_data_structures/src/CGALQt3/Kinetic_Qt_core.cpp +++ b/Kinetic_data_structures/src/CGALQt3/Kinetic_Qt_core.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/src/CGALQt3/Kinetic_Qt_timer.cpp b/Kinetic_data_structures/src/CGALQt3/Kinetic_Qt_timer.cpp index ca1520ee4ec..9405be40c0e 100644 --- a/Kinetic_data_structures/src/CGALQt3/Kinetic_Qt_timer.cpp +++ b/Kinetic_data_structures/src/CGALQt3/Kinetic_Qt_timer.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/src/CGALQt3/Kinetic_Qt_widget_2_core.cpp b/Kinetic_data_structures/src/CGALQt3/Kinetic_Qt_widget_2_core.cpp index 4a7f47e59da..f3c5630d2da 100644 --- a/Kinetic_data_structures/src/CGALQt3/Kinetic_Qt_widget_2_core.cpp +++ b/Kinetic_data_structures/src/CGALQt3/Kinetic_Qt_widget_2_core.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/src/CGALQt3/Kinetic_Qt_window_2.cpp b/Kinetic_data_structures/src/CGALQt3/Kinetic_Qt_window_2.cpp index e0cd5945c7e..cef82e53952 100644 --- a/Kinetic_data_structures/src/CGALQt3/Kinetic_Qt_window_2.cpp +++ b/Kinetic_data_structures/src/CGALQt3/Kinetic_Qt_window_2.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/src/CGALQt3/Kinetic_faster.xpm b/Kinetic_data_structures/src/CGALQt3/Kinetic_faster.xpm index a5177af2f43..8ff3240bf81 100644 --- a/Kinetic_data_structures/src/CGALQt3/Kinetic_faster.xpm +++ b/Kinetic_data_structures/src/CGALQt3/Kinetic_faster.xpm @@ -3,8 +3,8 @@ * * This file is part of CGAL (www.cgal.org); you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; version 2.1 of the License. - * See the file LICENSE.LGPL distributed with CGAL. + * published by the Free Software Foundation; either version 3 of the License, + * or (at your option) any later version. * * Licensees holding a valid commercial license may use this file in * accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/src/CGALQt3/Kinetic_pause.xpm b/Kinetic_data_structures/src/CGALQt3/Kinetic_pause.xpm index 6a1ee9c7bf1..5e5ba318f36 100644 --- a/Kinetic_data_structures/src/CGALQt3/Kinetic_pause.xpm +++ b/Kinetic_data_structures/src/CGALQt3/Kinetic_pause.xpm @@ -3,8 +3,8 @@ * * This file is part of CGAL (www.cgal.org); you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; version 2.1 of the License. - * See the file LICENSE.LGPL distributed with CGAL. + * published by the Free Software Foundation; either version 3 of the License, + * or (at your option) any later version. * * Licensees holding a valid commercial license may use this file in * accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/src/CGALQt3/Kinetic_pixmaps.cpp b/Kinetic_data_structures/src/CGALQt3/Kinetic_pixmaps.cpp index ebcbfdb06e5..2a00e7ca10b 100644 --- a/Kinetic_data_structures/src/CGALQt3/Kinetic_pixmaps.cpp +++ b/Kinetic_data_structures/src/CGALQt3/Kinetic_pixmaps.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/src/CGALQt3/Kinetic_play.xpm b/Kinetic_data_structures/src/CGALQt3/Kinetic_play.xpm index bba5a601f27..39fe7a510ff 100644 --- a/Kinetic_data_structures/src/CGALQt3/Kinetic_play.xpm +++ b/Kinetic_data_structures/src/CGALQt3/Kinetic_play.xpm @@ -3,8 +3,8 @@ * * This file is part of CGAL (www.cgal.org); you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; version 2.1 of the License. - * See the file LICENSE.LGPL distributed with CGAL. + * published by the Free Software Foundation; either version 3 of the License, + * or (at your option) any later version. * * Licensees holding a valid commercial license may use this file in * accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/src/CGALQt3/Kinetic_play_through.xpm b/Kinetic_data_structures/src/CGALQt3/Kinetic_play_through.xpm index aebcd6f3063..8a37b284f0b 100644 --- a/Kinetic_data_structures/src/CGALQt3/Kinetic_play_through.xpm +++ b/Kinetic_data_structures/src/CGALQt3/Kinetic_play_through.xpm @@ -3,8 +3,8 @@ * * This file is part of CGAL (www.cgal.org); you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; version 2.1 of the License. - * See the file LICENSE.LGPL distributed with CGAL. + * published by the Free Software Foundation; either version 3 of the License, + * or (at your option) any later version. * * Licensees holding a valid commercial license may use this file in * accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/src/CGALQt3/Kinetic_play_to.xpm b/Kinetic_data_structures/src/CGALQt3/Kinetic_play_to.xpm index 39a83925394..d1a15703b70 100644 --- a/Kinetic_data_structures/src/CGALQt3/Kinetic_play_to.xpm +++ b/Kinetic_data_structures/src/CGALQt3/Kinetic_play_to.xpm @@ -3,8 +3,8 @@ * * This file is part of CGAL (www.cgal.org); you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; version 2.1 of the License. - * See the file LICENSE.LGPL distributed with CGAL. + * published by the Free Software Foundation; either version 3 of the License, + * or (at your option) any later version. * * Licensees holding a valid commercial license may use this file in * accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/src/CGALQt3/Kinetic_print.xpm b/Kinetic_data_structures/src/CGALQt3/Kinetic_print.xpm index 4e694184a3c..f14314ce58f 100644 --- a/Kinetic_data_structures/src/CGALQt3/Kinetic_print.xpm +++ b/Kinetic_data_structures/src/CGALQt3/Kinetic_print.xpm @@ -3,8 +3,8 @@ * * This file is part of CGAL (www.cgal.org); you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; version 2.1 of the License. - * See the file LICENSE.LGPL distributed with CGAL. + * published by the Free Software Foundation; either version 3 of the License, + * or (at your option) any later version. * * Licensees holding a valid commercial license may use this file in * accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/src/CGALQt3/Kinetic_reverse.xpm b/Kinetic_data_structures/src/CGALQt3/Kinetic_reverse.xpm index 7f8f979eae3..ea4c485d21f 100644 --- a/Kinetic_data_structures/src/CGALQt3/Kinetic_reverse.xpm +++ b/Kinetic_data_structures/src/CGALQt3/Kinetic_reverse.xpm @@ -3,8 +3,8 @@ * * This file is part of CGAL (www.cgal.org); you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; version 2.1 of the License. - * See the file LICENSE.LGPL distributed with CGAL. + * published by the Free Software Foundation; either version 3 of the License, + * or (at your option) any later version. * * Licensees holding a valid commercial license may use this file in * accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/src/CGALQt3/Kinetic_slower.xpm b/Kinetic_data_structures/src/CGALQt3/Kinetic_slower.xpm index e35aa4d3413..c322386f64a 100644 --- a/Kinetic_data_structures/src/CGALQt3/Kinetic_slower.xpm +++ b/Kinetic_data_structures/src/CGALQt3/Kinetic_slower.xpm @@ -3,8 +3,8 @@ * * This file is part of CGAL (www.cgal.org); you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; version 2.1 of the License. - * See the file LICENSE.LGPL distributed with CGAL. + * published by the Free Software Foundation; either version 3 of the License, + * or (at your option) any later version. * * Licensees holding a valid commercial license may use this file in * accordance with the commercial license agreement provided with the software. diff --git a/Kinetic_data_structures/src/CGALQt3/Kinetic_stop.xpm b/Kinetic_data_structures/src/CGALQt3/Kinetic_stop.xpm index 94d028d7b31..f1c1dfc6869 100644 --- a/Kinetic_data_structures/src/CGALQt3/Kinetic_stop.xpm +++ b/Kinetic_data_structures/src/CGALQt3/Kinetic_stop.xpm @@ -3,8 +3,8 @@ * * This file is part of CGAL (www.cgal.org); you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; version 2.1 of the License. - * See the file LICENSE.LGPL distributed with CGAL. + * published by the Free Software Foundation; either version 3 of the License, + * or (at your option) any later version. * * Licensees holding a valid commercial license may use this file in * accordance with the commercial license agreement provided with the software. diff --git a/LEDA/include/CGAL/LEDA_basic.h b/LEDA/include/CGAL/LEDA_basic.h index 7687b06be87..5eec9bd390b 100644 --- a/LEDA/include/CGAL/LEDA_basic.h +++ b/LEDA/include/CGAL/LEDA_basic.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/LEDA/include/CGAL/leda_in_CGAL_2.h b/LEDA/include/CGAL/leda_in_CGAL_2.h index 18ab62647cc..ea7abf5b956 100644 --- a/LEDA/include/CGAL/leda_in_CGAL_2.h +++ b/LEDA/include/CGAL/leda_in_CGAL_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/LEDA/include/CGAL/rat_leda_in_CGAL_2.h b/LEDA/include/CGAL/rat_leda_in_CGAL_2.h index d06960bfd03..ced43d401a2 100644 --- a/LEDA/include/CGAL/rat_leda_in_CGAL_2.h +++ b/LEDA/include/CGAL/rat_leda_in_CGAL_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/LEDA/test/LEDA/include/CGAL/predicates_on_points_rat_leda_2.h b/LEDA/test/LEDA/include/CGAL/predicates_on_points_rat_leda_2.h index f28baa5e727..e70d1f434fd 100644 --- a/LEDA/test/LEDA/include/CGAL/predicates_on_points_rat_leda_2.h +++ b/LEDA/test/LEDA/include/CGAL/predicates_on_points_rat_leda_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/LEDA/test/LEDA/include/CGAL/rat_leda.h b/LEDA/test/LEDA/include/CGAL/rat_leda.h index 8c60e4a4feb..8efc73385ab 100644 --- a/LEDA/test/LEDA/include/CGAL/rat_leda.h +++ b/LEDA/test/LEDA/include/CGAL/rat_leda.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/LEDA/test/LEDA/test_with_leda_kernel_2.cpp b/LEDA/test/LEDA/test_with_leda_kernel_2.cpp index 2c786830d9c..4c1c7cb0653 100644 --- a/LEDA/test/LEDA/test_with_leda_kernel_2.cpp +++ b/LEDA/test/LEDA/test_with_leda_kernel_2.cpp @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/MacOSX/scripts/cgal_make_macosx_app b/MacOSX/scripts/cgal_make_macosx_app index f6b7cb55b02..98ceacf6fc2 100755 --- a/MacOSX/scripts/cgal_make_macosx_app +++ b/MacOSX/scripts/cgal_make_macosx_app @@ -6,8 +6,8 @@ # # This file is part of CGAL (www.cgal.org); you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation; version 2.1 of the License. -# See the file LICENSE.LGPL distributed with CGAL. +# published by the Free Software Foundation; version 3 of the License, +# or (at your option) any later version. # # Licensees holding a valid commercial license may use this file in # accordance with the commercial license agreement provided with the software. diff --git a/Maintenance/MacOSX_Installer/Resources/License.rtf b/Maintenance/MacOSX_Installer/Resources/License.rtf index b1e7f6ae87e..8629c808660 100644 --- a/Maintenance/MacOSX_Installer/Resources/License.rtf +++ b/Maintenance/MacOSX_Installer/Resources/License.rtf @@ -23,7 +23,7 @@ The source code of the CGAL library can be found in the directories\ "src" (excluding "src/Core") and "include/CGAL". It is specified in each\ file of the CGAL library which license applies to it. This is either the\ GNU Lesser General Public License (as published by the Free\ -Software Foundation; version 2.1 of the License) or the Q Public\ +Software Foundation; version 3 of the License) or the Q Public\ License (version 1.0). The texts of both licenses can be found in the\ files LICENSE.LGPL and LICENSE.QPL. \ \ diff --git a/Maintenance/deb/sid/debian/copyright b/Maintenance/deb/sid/debian/copyright index e8befc994ce..9e4534a1264 100644 --- a/Maintenance/deb/sid/debian/copyright +++ b/Maintenance/deb/sid/debian/copyright @@ -5,8 +5,8 @@ It was downloaded from http://www.cgal.org/download/index.html. The Debian packaging is Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009 Joachim Reichel and is licensed under the LGPL license, -version 2.1 or later (at your option), which can be found in -/usr/share/common-licenses/LGPL-2.1. +either version 3 or later (at your option), which can be found in +/usr/share/common-licenses/LGPL-3. The package is not in main, but in non-free since parts of it are licensed under the QPL. This license is not DFSG-free, but it permits one to autobuild @@ -159,7 +159,7 @@ Copyright (from upstream file LICENSE) exception of "include/CGAL/CORE", and "include/CGAL/OpenNL"). It is specified in each file of the CGAL library which license applies to it. This is either the GNU Lesser General Public License - (as published by the Free Software Foundation; version 2.1 of the License) + (as published by the Free Software Foundation; version 3 of the License) or the Q Public License (version 1.0), *depending on each file*. The texts of both licenses can be found in the files LICENSE.LGPL and LICENSE.QPL. @@ -198,8 +198,8 @@ file to file. This file is part of CGAL (www.cgal.org); you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; version 2.1 of the License. - See the file LICENSE.LGPL distributed with CGAL. + published by the Free Software Foundation; either version 3 of the License, + or (at your option) any later version. Licensees holding a valid commercial license may use this file in accordance with the commercial license agreement provided with the software. @@ -320,7 +320,7 @@ include/CGAL/OpenNL. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public - License version 2.1 as published by the Free Software Foundation + License version 3 as published by the Free Software Foundation This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -328,7 +328,7 @@ include/CGAL/OpenNL. Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License - along with this library; see the file /usr/share/common-licenses/LGPL-2.1. + along with this library; see the file /usr/share/common-licenses/LGPL-3. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA diff --git a/Maintenance/deb/squeeze/debian/copyright b/Maintenance/deb/squeeze/debian/copyright index e8befc994ce..d20c1271fa3 100644 --- a/Maintenance/deb/squeeze/debian/copyright +++ b/Maintenance/deb/squeeze/debian/copyright @@ -5,8 +5,8 @@ It was downloaded from http://www.cgal.org/download/index.html. The Debian packaging is Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009 Joachim Reichel and is licensed under the LGPL license, -version 2.1 or later (at your option), which can be found in -/usr/share/common-licenses/LGPL-2.1. +eihter version 3 or later (at your option), which can be found in +/usr/share/common-licenses/LGPL-3. The package is not in main, but in non-free since parts of it are licensed under the QPL. This license is not DFSG-free, but it permits one to autobuild @@ -159,7 +159,7 @@ Copyright (from upstream file LICENSE) exception of "include/CGAL/CORE", and "include/CGAL/OpenNL"). It is specified in each file of the CGAL library which license applies to it. This is either the GNU Lesser General Public License - (as published by the Free Software Foundation; version 2.1 of the License) + (as published by the Free Software Foundation; version 3 of the License) or the Q Public License (version 1.0), *depending on each file*. The texts of both licenses can be found in the files LICENSE.LGPL and LICENSE.QPL. @@ -198,8 +198,8 @@ file to file. This file is part of CGAL (www.cgal.org); you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; version 2.1 of the License. - See the file LICENSE.LGPL distributed with CGAL. + published by the Free Software Foundation; either version 3 of the License, + or (at your option) any later version. Licensees holding a valid commercial license may use this file in accordance with the commercial license agreement provided with the software. @@ -320,7 +320,7 @@ include/CGAL/OpenNL. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public - License version 2.1 as published by the Free Software Foundation + License version 3 as published by the Free Software Foundation This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -328,7 +328,7 @@ include/CGAL/OpenNL. Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License - along with this library; see the file /usr/share/common-licenses/LGPL-2.1. + along with this library; see the file /usr/share/common-licenses/LGPL-3. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA diff --git a/Maintenance/deb/wheezy/debian/copyright b/Maintenance/deb/wheezy/debian/copyright index e8befc994ce..b6cda7fe15d 100644 --- a/Maintenance/deb/wheezy/debian/copyright +++ b/Maintenance/deb/wheezy/debian/copyright @@ -5,8 +5,8 @@ It was downloaded from http://www.cgal.org/download/index.html. The Debian packaging is Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009 Joachim Reichel and is licensed under the LGPL license, -version 2.1 or later (at your option), which can be found in -/usr/share/common-licenses/LGPL-2.1. +either version 3 or later (at your option), which can be found in +/usr/share/common-licenses/LGPL-3. The package is not in main, but in non-free since parts of it are licensed under the QPL. This license is not DFSG-free, but it permits one to autobuild @@ -159,7 +159,7 @@ Copyright (from upstream file LICENSE) exception of "include/CGAL/CORE", and "include/CGAL/OpenNL"). It is specified in each file of the CGAL library which license applies to it. This is either the GNU Lesser General Public License - (as published by the Free Software Foundation; version 2.1 of the License) + (as published by the Free Software Foundation; version 3 of the License) or the Q Public License (version 1.0), *depending on each file*. The texts of both licenses can be found in the files LICENSE.LGPL and LICENSE.QPL. @@ -198,8 +198,8 @@ file to file. This file is part of CGAL (www.cgal.org); you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; version 2.1 of the License. - See the file LICENSE.LGPL distributed with CGAL. + published by the Free Software Foundation; either version 3 of the License. + or (at your option) any later version. Licensees holding a valid commercial license may use this file in accordance with the commercial license agreement provided with the software. @@ -320,7 +320,7 @@ include/CGAL/OpenNL. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public - License version 2.1 as published by the Free Software Foundation + License version 3 as published by the Free Software Foundation This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -328,7 +328,7 @@ include/CGAL/OpenNL. Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License - along with this library; see the file /usr/share/common-licenses/LGPL-2.1. + along with this library; see the file /usr/share/common-licenses/LGPL-3. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA diff --git a/Maintenance/package_handling/new_headers b/Maintenance/package_handling/new_headers index 6074613f6e9..aadbb393872 100755 --- a/Maintenance/package_handling/new_headers +++ b/Maintenance/package_handling/new_headers @@ -68,8 +68,8 @@ sub print_lgpl_license() print TEMPFILE <<'END_OF_LICENSE'; // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Maintenance/package_handling/new_headers_v2 b/Maintenance/package_handling/new_headers_v2 index 23a92313b02..ea499f48163 100755 --- a/Maintenance/package_handling/new_headers_v2 +++ b/Maintenance/package_handling/new_headers_v2 @@ -69,8 +69,8 @@ sub print_lgpl_license() print TEMPFILE <<'END_OF_LICENSE'; // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. END_OF_LICENSE } diff --git a/Manual/developer_scripts/cgal_manual b/Manual/developer_scripts/cgal_manual index 9b9825294d6..dc1292b5121 100755 --- a/Manual/developer_scripts/cgal_manual +++ b/Manual/developer_scripts/cgal_manual @@ -7,8 +7,8 @@ # # This file is part of CGAL (www.cgal.org); you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation; version 2.1 of the License. -# See the file LICENSE.LGPL distributed with CGAL. +# published by the Free Software Foundation; either version 3 of the License, +# or (at your option) any later version. # # Licensees holding a valid commercial license may use this file in # accordance with the commercial license agreement provided with the software. diff --git a/Mesh_2/demo/Mesh_2/Qt3/Qt_layer_show_circles.h b/Mesh_2/demo/Mesh_2/Qt3/Qt_layer_show_circles.h index 49b9db00165..ae60958b8a4 100644 --- a/Mesh_2/demo/Mesh_2/Qt3/Qt_layer_show_circles.h +++ b/Mesh_2/demo/Mesh_2/Qt3/Qt_layer_show_circles.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Mesh_2/demo/Mesh_2/Qt3/Qt_layer_show_triangulation.h b/Mesh_2/demo/Mesh_2/Qt3/Qt_layer_show_triangulation.h index 736a567eaef..94782780c32 100644 --- a/Mesh_2/demo/Mesh_2/Qt3/Qt_layer_show_triangulation.h +++ b/Mesh_2/demo/Mesh_2/Qt3/Qt_layer_show_triangulation.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Mesh_2/demo/Mesh_2/Qt3/Qt_layer_show_triangulation_constraints.h b/Mesh_2/demo/Mesh_2/Qt3/Qt_layer_show_triangulation_constraints.h index f45e131d979..a73b6a476b8 100644 --- a/Mesh_2/demo/Mesh_2/Qt3/Qt_layer_show_triangulation_constraints.h +++ b/Mesh_2/demo/Mesh_2/Qt3/Qt_layer_show_triangulation_constraints.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Mesh_2/demo/Mesh_2/Qt3/Qt_widget_style_editor-aux.h b/Mesh_2/demo/Mesh_2/Qt3/Qt_widget_style_editor-aux.h index 74651fa73be..ccfeaa5d733 100644 --- a/Mesh_2/demo/Mesh_2/Qt3/Qt_widget_style_editor-aux.h +++ b/Mesh_2/demo/Mesh_2/Qt3/Qt_widget_style_editor-aux.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Mesh_2/demo/Mesh_2/Qt3/Qt_widget_style_editor.cpp b/Mesh_2/demo/Mesh_2/Qt3/Qt_widget_style_editor.cpp index f05edcd47d1..183ff6e41dd 100644 --- a/Mesh_2/demo/Mesh_2/Qt3/Qt_widget_style_editor.cpp +++ b/Mesh_2/demo/Mesh_2/Qt3/Qt_widget_style_editor.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Mesh_2/demo/Mesh_2/Qt3/Qt_widget_style_editor.h b/Mesh_2/demo/Mesh_2/Qt3/Qt_widget_style_editor.h index 9c4222493f4..62aabecefd6 100644 --- a/Mesh_2/demo/Mesh_2/Qt3/Qt_widget_style_editor.h +++ b/Mesh_2/demo/Mesh_2/Qt3/Qt_widget_style_editor.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Mesh_2/demo/Mesh_2/Qt3/Qt_widget_styled_layer.cpp b/Mesh_2/demo/Mesh_2/Qt3/Qt_widget_styled_layer.cpp index 63da75160e0..439f99b0ce9 100644 --- a/Mesh_2/demo/Mesh_2/Qt3/Qt_widget_styled_layer.cpp +++ b/Mesh_2/demo/Mesh_2/Qt3/Qt_widget_styled_layer.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Mesh_2/demo/Mesh_2/Qt3/Qt_widget_styled_layer.h b/Mesh_2/demo/Mesh_2/Qt3/Qt_widget_styled_layer.h index 5f4959d7901..5a7c3477412 100644 --- a/Mesh_2/demo/Mesh_2/Qt3/Qt_widget_styled_layer.h +++ b/Mesh_2/demo/Mesh_2/Qt3/Qt_widget_styled_layer.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Mesh_2/demo/Mesh_2/Qt3/Show_clusters.h b/Mesh_2/demo/Mesh_2/Qt3/Show_clusters.h index 2fbdf310290..aeaf3c5e5fe 100644 --- a/Mesh_2/demo/Mesh_2/Qt3/Show_clusters.h +++ b/Mesh_2/demo/Mesh_2/Qt3/Show_clusters.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Mesh_2/demo/Mesh_2/Qt3/Show_points.cpp b/Mesh_2/demo/Mesh_2/Qt3/Show_points.cpp index 72b44ead3f7..597d9e9f6ef 100644 --- a/Mesh_2/demo/Mesh_2/Qt3/Show_points.cpp +++ b/Mesh_2/demo/Mesh_2/Qt3/Show_points.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Mesh_2/demo/Mesh_2/Qt3/Show_points.h b/Mesh_2/demo/Mesh_2/Qt3/Show_points.h index 15b977358ba..989ad52915c 100644 --- a/Mesh_2/demo/Mesh_2/Qt3/Show_points.h +++ b/Mesh_2/demo/Mesh_2/Qt3/Show_points.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Mesh_2/demo/Mesh_2/Qt3/Show_segments.h b/Mesh_2/demo/Mesh_2/Qt3/Show_segments.h index 9ffa7135265..5cca1ae330c 100644 --- a/Mesh_2/demo/Mesh_2/Qt3/Show_segments.h +++ b/Mesh_2/demo/Mesh_2/Qt3/Show_segments.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Mesh_2/demo/Mesh_2/Qt3/Show_segments_base.cpp b/Mesh_2/demo/Mesh_2/Qt3/Show_segments_base.cpp index d8afe22c8d7..5af4172f297 100644 --- a/Mesh_2/demo/Mesh_2/Qt3/Show_segments_base.cpp +++ b/Mesh_2/demo/Mesh_2/Qt3/Show_segments_base.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Mesh_2/demo/Mesh_2/Qt3/Show_segments_base.h b/Mesh_2/demo/Mesh_2/Qt3/Show_segments_base.h index 8afcce240b5..34fb7aed191 100644 --- a/Mesh_2/demo/Mesh_2/Qt3/Show_segments_base.h +++ b/Mesh_2/demo/Mesh_2/Qt3/Show_segments_base.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Mesh_2/demo/Mesh_2/Qt3/icons.cpp b/Mesh_2/demo/Mesh_2/Qt3/icons.cpp index 962fbc6301b..93ef11aaa79 100644 --- a/Mesh_2/demo/Mesh_2/Qt3/icons.cpp +++ b/Mesh_2/demo/Mesh_2/Qt3/icons.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Mesh_2/demo/Mesh_2/Qt3/icons.h b/Mesh_2/demo/Mesh_2/Qt3/icons.h index 6c18a84ba1c..7e8df269643 100644 --- a/Mesh_2/demo/Mesh_2/Qt3/icons.h +++ b/Mesh_2/demo/Mesh_2/Qt3/icons.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Mesh_2/demo/Mesh_2/Qt3/mesh_2_demo.cpp b/Mesh_2/demo/Mesh_2/Qt3/mesh_2_demo.cpp index 948171951d2..ef2382c56e6 100644 --- a/Mesh_2/demo/Mesh_2/Qt3/mesh_2_demo.cpp +++ b/Mesh_2/demo/Mesh_2/Qt3/mesh_2_demo.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Mesh_2/demo/Mesh_2/conform.cpp b/Mesh_2/demo/Mesh_2/conform.cpp index 7f0f676b2eb..dce534feeb6 100644 --- a/Mesh_2/demo/Mesh_2/conform.cpp +++ b/Mesh_2/demo/Mesh_2/conform.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Mesh_2/demo/Mesh_2/mesh.cpp b/Mesh_2/demo/Mesh_2/mesh.cpp index 3b5c01660ef..fdbc19c95b9 100644 --- a/Mesh_2/demo/Mesh_2/mesh.cpp +++ b/Mesh_2/demo/Mesh_2/mesh.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Mesh_3/test/Mesh_3/test_backward_compatibility_MeshFoobarCriteria_3.cpp b/Mesh_3/test/Mesh_3/test_backward_compatibility_MeshFoobarCriteria_3.cpp index 178c7d27bfc..af28e961706 100644 --- a/Mesh_3/test/Mesh_3/test_backward_compatibility_MeshFoobarCriteria_3.cpp +++ b/Mesh_3/test/Mesh_3/test_backward_compatibility_MeshFoobarCriteria_3.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Mesh_3/test/Mesh_3/test_boost_has_xxx.cpp b/Mesh_3/test/Mesh_3/test_boost_has_xxx.cpp index 86d1531141a..0f9c4c9795b 100644 --- a/Mesh_3/test/Mesh_3/test_boost_has_xxx.cpp +++ b/Mesh_3/test/Mesh_3/test_boost_has_xxx.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Min_sphere_d/include/CGAL/Min_sphere_annulus_d_traits_2.h b/Min_sphere_d/include/CGAL/Min_sphere_annulus_d_traits_2.h index 67677ad788a..2591a5fec64 100644 --- a/Min_sphere_d/include/CGAL/Min_sphere_annulus_d_traits_2.h +++ b/Min_sphere_d/include/CGAL/Min_sphere_annulus_d_traits_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Min_sphere_d/include/CGAL/Min_sphere_annulus_d_traits_3.h b/Min_sphere_d/include/CGAL/Min_sphere_annulus_d_traits_3.h index 0ccbc4834bc..592c0ce3c0f 100644 --- a/Min_sphere_d/include/CGAL/Min_sphere_annulus_d_traits_3.h +++ b/Min_sphere_d/include/CGAL/Min_sphere_annulus_d_traits_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Min_sphere_d/include/CGAL/Min_sphere_annulus_d_traits_d.h b/Min_sphere_d/include/CGAL/Min_sphere_annulus_d_traits_d.h index 750bfa11cad..3cf7422fc77 100644 --- a/Min_sphere_d/include/CGAL/Min_sphere_annulus_d_traits_d.h +++ b/Min_sphere_d/include/CGAL/Min_sphere_annulus_d_traits_d.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Modifier/include/CGAL/Modifier_base.h b/Modifier/include/CGAL/Modifier_base.h index 47fd63d4060..2782b65ea39 100644 --- a/Modifier/include/CGAL/Modifier_base.h +++ b/Modifier/include/CGAL/Modifier_base.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Modular_arithmetic/include/CGAL/Modular_arithmetic/Residue_type.h b/Modular_arithmetic/include/CGAL/Modular_arithmetic/Residue_type.h index 413513cb659..2d4f718d554 100644 --- a/Modular_arithmetic/include/CGAL/Modular_arithmetic/Residue_type.h +++ b/Modular_arithmetic/include/CGAL/Modular_arithmetic/Residue_type.h @@ -4,8 +4,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Modular_arithmetic/include/CGAL/Modular_traits.h b/Modular_arithmetic/include/CGAL/Modular_traits.h index ed8e68f07ed..7a77db0641f 100644 --- a/Modular_arithmetic/include/CGAL/Modular_traits.h +++ b/Modular_arithmetic/include/CGAL/Modular_traits.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Modular_arithmetic/include/CGAL/Residue.h b/Modular_arithmetic/include/CGAL/Residue.h index 8a06a77ee9a..5d133b22d08 100644 --- a/Modular_arithmetic/include/CGAL/Residue.h +++ b/Modular_arithmetic/include/CGAL/Residue.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Modular_arithmetic/include/CGAL/primes.h b/Modular_arithmetic/include/CGAL/primes.h index 49d00e0071a..ddc0c8ca24d 100644 --- a/Modular_arithmetic/include/CGAL/primes.h +++ b/Modular_arithmetic/include/CGAL/primes.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Modular_arithmetic/src/CGAL/Residue_type.cpp b/Modular_arithmetic/src/CGAL/Residue_type.cpp index a81bb816539..9894d1d7075 100644 --- a/Modular_arithmetic/src/CGAL/Residue_type.cpp +++ b/Modular_arithmetic/src/CGAL/Residue_type.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Modular_arithmetic/src/CGAL/primes.cpp b/Modular_arithmetic/src/CGAL/primes.cpp index a2d21bfbe06..524356f3fa8 100644 --- a/Modular_arithmetic/src/CGAL/primes.cpp +++ b/Modular_arithmetic/src/CGAL/primes.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Nef_2/include/CGAL/Nef_2/Polynomial.h b/Nef_2/include/CGAL/Nef_2/Polynomial.h index 1246dc1a903..a5e805bbadf 100644 --- a/Nef_2/include/CGAL/Nef_2/Polynomial.h +++ b/Nef_2/include/CGAL/Nef_2/Polynomial.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Nef_2/include/CGAL/Nef_2/debug.h b/Nef_2/include/CGAL/Nef_2/debug.h index 44a27d0d9a7..b996f360a22 100644 --- a/Nef_2/include/CGAL/Nef_2/debug.h +++ b/Nef_2/include/CGAL/Nef_2/debug.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Nef_2/include/CGAL/Nef_polynomial_fwd.h b/Nef_2/include/CGAL/Nef_polynomial_fwd.h index 8c600fdcbc2..525afed1f19 100644 --- a/Nef_2/include/CGAL/Nef_polynomial_fwd.h +++ b/Nef_2/include/CGAL/Nef_polynomial_fwd.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Nef_2/src/CGAL/NefPolynomial.cpp b/Nef_2/src/CGAL/NefPolynomial.cpp index 5f4ee61d029..261074845cf 100644 --- a/Nef_2/src/CGAL/NefPolynomial.cpp +++ b/Nef_2/src/CGAL/NefPolynomial.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Nef_S2/include/CGAL/IO/Qt_widget_OpenGL.h b/Nef_S2/include/CGAL/IO/Qt_widget_OpenGL.h index a9e0a0ccb4e..a7a392bd809 100644 --- a/Nef_S2/include/CGAL/IO/Qt_widget_OpenGL.h +++ b/Nef_S2/include/CGAL/IO/Qt_widget_OpenGL.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Nef_S2/include/CGAL/Nef_S2/OGL_base_object.h b/Nef_S2/include/CGAL/Nef_S2/OGL_base_object.h index 8f8d76854c9..42762b14416 100644 --- a/Nef_S2/include/CGAL/Nef_S2/OGL_base_object.h +++ b/Nef_S2/include/CGAL/Nef_S2/OGL_base_object.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Nef_S2/src/CGALQt3/Qt_widget_OpenGL.cpp b/Nef_S2/src/CGALQt3/Qt_widget_OpenGL.cpp index b3b13b67e8b..1d8dc22e817 100644 --- a/Nef_S2/src/CGALQt3/Qt_widget_OpenGL.cpp +++ b/Nef_S2/src/CGALQt3/Qt_widget_OpenGL.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/CORE_BigFloat.h b/Number_types/include/CGAL/CORE_BigFloat.h index 06a0f16d71d..52526862fe9 100644 --- a/Number_types/include/CGAL/CORE_BigFloat.h +++ b/Number_types/include/CGAL/CORE_BigFloat.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/CORE_BigInt.h b/Number_types/include/CGAL/CORE_BigInt.h index b84dbf16d31..1eefad867b5 100644 --- a/Number_types/include/CGAL/CORE_BigInt.h +++ b/Number_types/include/CGAL/CORE_BigInt.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/CORE_BigRat.h b/Number_types/include/CGAL/CORE_BigRat.h index ac3c183e5e3..27e3b79f515 100644 --- a/Number_types/include/CGAL/CORE_BigRat.h +++ b/Number_types/include/CGAL/CORE_BigRat.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/CORE_Expr.h b/Number_types/include/CGAL/CORE_Expr.h index a8c83232844..f1e6535cdc4 100644 --- a/Number_types/include/CGAL/CORE_Expr.h +++ b/Number_types/include/CGAL/CORE_Expr.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/CORE_coercion_traits.h b/Number_types/include/CGAL/CORE_coercion_traits.h index 15c6322525c..d097ffcc6f1 100644 --- a/Number_types/include/CGAL/CORE_coercion_traits.h +++ b/Number_types/include/CGAL/CORE_coercion_traits.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/Counted_number.h b/Number_types/include/CGAL/Counted_number.h index caec345d55d..d6c4fc05f74 100644 --- a/Number_types/include/CGAL/Counted_number.h +++ b/Number_types/include/CGAL/Counted_number.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/FPU.h b/Number_types/include/CGAL/FPU.h index e3b574b96e9..569bef2f848 100644 --- a/Number_types/include/CGAL/FPU.h +++ b/Number_types/include/CGAL/FPU.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/GMP/Gmpfi_type.h b/Number_types/include/CGAL/GMP/Gmpfi_type.h index c2e781cf923..5c63330ff21 100644 --- a/Number_types/include/CGAL/GMP/Gmpfi_type.h +++ b/Number_types/include/CGAL/GMP/Gmpfi_type.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/GMP/Gmpfi_type_static.h b/Number_types/include/CGAL/GMP/Gmpfi_type_static.h index 481b056c0c7..b9cfca8449c 100644 --- a/Number_types/include/CGAL/GMP/Gmpfi_type_static.h +++ b/Number_types/include/CGAL/GMP/Gmpfi_type_static.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/GMP/Gmpfr_type.h b/Number_types/include/CGAL/GMP/Gmpfr_type.h index 10a365e5d5f..d61b3851109 100644 --- a/Number_types/include/CGAL/GMP/Gmpfr_type.h +++ b/Number_types/include/CGAL/GMP/Gmpfr_type.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/GMP/Gmpfr_type_static.h b/Number_types/include/CGAL/GMP/Gmpfr_type_static.h index e9f65239895..c8030e368ee 100644 --- a/Number_types/include/CGAL/GMP/Gmpfr_type_static.h +++ b/Number_types/include/CGAL/GMP/Gmpfr_type_static.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/GMP/Gmpq_type.h b/Number_types/include/CGAL/GMP/Gmpq_type.h index 348e1cae6ec..c7462c57ec5 100644 --- a/Number_types/include/CGAL/GMP/Gmpq_type.h +++ b/Number_types/include/CGAL/GMP/Gmpq_type.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/GMP/Gmpz_type.h b/Number_types/include/CGAL/GMP/Gmpz_type.h index 389e82aabde..81f03f4976c 100644 --- a/Number_types/include/CGAL/GMP/Gmpz_type.h +++ b/Number_types/include/CGAL/GMP/Gmpz_type.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/GMP/Gmpzf_type.h b/Number_types/include/CGAL/GMP/Gmpzf_type.h index 8abfae04524..e2e6e0300d9 100644 --- a/Number_types/include/CGAL/GMP/Gmpzf_type.h +++ b/Number_types/include/CGAL/GMP/Gmpzf_type.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/Gmp_coercion_traits.h b/Number_types/include/CGAL/Gmp_coercion_traits.h index 91ec72f0d76..9b07fbbbc9e 100644 --- a/Number_types/include/CGAL/Gmp_coercion_traits.h +++ b/Number_types/include/CGAL/Gmp_coercion_traits.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/Gmpfi.h b/Number_types/include/CGAL/Gmpfi.h index c81cf058e53..62aba548026 100644 --- a/Number_types/include/CGAL/Gmpfi.h +++ b/Number_types/include/CGAL/Gmpfi.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/Gmpfr.h b/Number_types/include/CGAL/Gmpfr.h index 3b1037a4d16..50936501ab2 100644 --- a/Number_types/include/CGAL/Gmpfr.h +++ b/Number_types/include/CGAL/Gmpfr.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/Gmpq.h b/Number_types/include/CGAL/Gmpq.h index ab6891d4784..e4675b013c4 100644 --- a/Number_types/include/CGAL/Gmpq.h +++ b/Number_types/include/CGAL/Gmpq.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/Gmpz.h b/Number_types/include/CGAL/Gmpz.h index 562cd01d135..00fa8bf734e 100644 --- a/Number_types/include/CGAL/Gmpz.h +++ b/Number_types/include/CGAL/Gmpz.h @@ -4,8 +4,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/Gmpzf.h b/Number_types/include/CGAL/Gmpzf.h index 7f3720ec3d4..779bf7b7f10 100644 --- a/Number_types/include/CGAL/Gmpzf.h +++ b/Number_types/include/CGAL/Gmpzf.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/IEEE_754_unions.h b/Number_types/include/CGAL/IEEE_754_unions.h index 8b0959ad58f..3b3a96117f6 100644 --- a/Number_types/include/CGAL/IEEE_754_unions.h +++ b/Number_types/include/CGAL/IEEE_754_unions.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/Interval_arithmetic.h b/Number_types/include/CGAL/Interval_arithmetic.h index 75fb819b7e8..c2e83ebe820 100644 --- a/Number_types/include/CGAL/Interval_arithmetic.h +++ b/Number_types/include/CGAL/Interval_arithmetic.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/Interval_nt.h b/Number_types/include/CGAL/Interval_nt.h index 7bc8cfc12a7..fe847e17dfe 100644 --- a/Number_types/include/CGAL/Interval_nt.h +++ b/Number_types/include/CGAL/Interval_nt.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/Lazy_exact_nt.h b/Number_types/include/CGAL/Lazy_exact_nt.h index 455fe29df48..913e6973f72 100644 --- a/Number_types/include/CGAL/Lazy_exact_nt.h +++ b/Number_types/include/CGAL/Lazy_exact_nt.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/MP_Float.h b/Number_types/include/CGAL/MP_Float.h index 8de00ad8fdf..b37025c4417 100644 --- a/Number_types/include/CGAL/MP_Float.h +++ b/Number_types/include/CGAL/MP_Float.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/NT_converter.h b/Number_types/include/CGAL/NT_converter.h index 9048b0eaf2f..0f24dfa70af 100644 --- a/Number_types/include/CGAL/NT_converter.h +++ b/Number_types/include/CGAL/NT_converter.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/Number_type_checker.h b/Number_types/include/CGAL/Number_type_checker.h index 1bcd258d0f9..24eff952124 100644 --- a/Number_types/include/CGAL/Number_type_checker.h +++ b/Number_types/include/CGAL/Number_type_checker.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/Number_types/internal_functions_comparison_root_of_2.h b/Number_types/include/CGAL/Number_types/internal_functions_comparison_root_of_2.h index dd5f223b89a..b76925335ce 100644 --- a/Number_types/include/CGAL/Number_types/internal_functions_comparison_root_of_2.h +++ b/Number_types/include/CGAL/Number_types/internal_functions_comparison_root_of_2.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/Quotient.h b/Number_types/include/CGAL/Quotient.h index 10eabcb5f0b..e85bd64acef 100644 --- a/Number_types/include/CGAL/Quotient.h +++ b/Number_types/include/CGAL/Quotient.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/Quotient_fwd.h b/Number_types/include/CGAL/Quotient_fwd.h index 29a71347712..199afec045b 100644 --- a/Number_types/include/CGAL/Quotient_fwd.h +++ b/Number_types/include/CGAL/Quotient_fwd.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/Root_of_2.h b/Number_types/include/CGAL/Root_of_2.h index 4a88d16fd3c..3bca63d0c50 100644 --- a/Number_types/include/CGAL/Root_of_2.h +++ b/Number_types/include/CGAL/Root_of_2.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/Root_of_traits.h b/Number_types/include/CGAL/Root_of_traits.h index 7a72251c11a..20122a9e08b 100644 --- a/Number_types/include/CGAL/Root_of_traits.h +++ b/Number_types/include/CGAL/Root_of_traits.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/Root_of_traits_specializations.h b/Number_types/include/CGAL/Root_of_traits_specializations.h index 15463fbd4e7..80071c82460 100644 --- a/Number_types/include/CGAL/Root_of_traits_specializations.h +++ b/Number_types/include/CGAL/Root_of_traits_specializations.h @@ -4,8 +4,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/Sqrt_extension.h b/Number_types/include/CGAL/Sqrt_extension.h index 9230cffd981..27c1f59653c 100644 --- a/Number_types/include/CGAL/Sqrt_extension.h +++ b/Number_types/include/CGAL/Sqrt_extension.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/Sqrt_extension/Algebraic_extension_traits.h b/Number_types/include/CGAL/Sqrt_extension/Algebraic_extension_traits.h index f77a951ad8f..5c7219fff8a 100644 --- a/Number_types/include/CGAL/Sqrt_extension/Algebraic_extension_traits.h +++ b/Number_types/include/CGAL/Sqrt_extension/Algebraic_extension_traits.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/Sqrt_extension/Algebraic_structure_traits.h b/Number_types/include/CGAL/Sqrt_extension/Algebraic_structure_traits.h index d9de8633893..e9d80966768 100644 --- a/Number_types/include/CGAL/Sqrt_extension/Algebraic_structure_traits.h +++ b/Number_types/include/CGAL/Sqrt_extension/Algebraic_structure_traits.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/Sqrt_extension/Chinese_remainder_traits.h b/Number_types/include/CGAL/Sqrt_extension/Chinese_remainder_traits.h index 9c21ca52f46..3d34596afa5 100644 --- a/Number_types/include/CGAL/Sqrt_extension/Chinese_remainder_traits.h +++ b/Number_types/include/CGAL/Sqrt_extension/Chinese_remainder_traits.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/Sqrt_extension/Coercion_traits.h b/Number_types/include/CGAL/Sqrt_extension/Coercion_traits.h index f381c676ec5..d76577b2554 100644 --- a/Number_types/include/CGAL/Sqrt_extension/Coercion_traits.h +++ b/Number_types/include/CGAL/Sqrt_extension/Coercion_traits.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/Sqrt_extension/Fraction_traits.h b/Number_types/include/CGAL/Sqrt_extension/Fraction_traits.h index b525aa2471a..bbb0a49a5f7 100644 --- a/Number_types/include/CGAL/Sqrt_extension/Fraction_traits.h +++ b/Number_types/include/CGAL/Sqrt_extension/Fraction_traits.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/Sqrt_extension/Get_arithmetic_kernel.h b/Number_types/include/CGAL/Sqrt_extension/Get_arithmetic_kernel.h index 478d1a8a4f3..ea317864d14 100644 --- a/Number_types/include/CGAL/Sqrt_extension/Get_arithmetic_kernel.h +++ b/Number_types/include/CGAL/Sqrt_extension/Get_arithmetic_kernel.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/Sqrt_extension/Modular_traits.h b/Number_types/include/CGAL/Sqrt_extension/Modular_traits.h index 8f45a9987f2..8a1bfe59b58 100644 --- a/Number_types/include/CGAL/Sqrt_extension/Modular_traits.h +++ b/Number_types/include/CGAL/Sqrt_extension/Modular_traits.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/Sqrt_extension/Real_embeddable_traits.h b/Number_types/include/CGAL/Sqrt_extension/Real_embeddable_traits.h index 29ab55396b0..ef6e5722908 100644 --- a/Number_types/include/CGAL/Sqrt_extension/Real_embeddable_traits.h +++ b/Number_types/include/CGAL/Sqrt_extension/Real_embeddable_traits.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/Sqrt_extension/Scalar_factor_traits.h b/Number_types/include/CGAL/Sqrt_extension/Scalar_factor_traits.h index 519e83fdd01..a77f65c18f6 100644 --- a/Number_types/include/CGAL/Sqrt_extension/Scalar_factor_traits.h +++ b/Number_types/include/CGAL/Sqrt_extension/Scalar_factor_traits.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/Sqrt_extension/Sqrt_extension_type.h b/Number_types/include/CGAL/Sqrt_extension/Sqrt_extension_type.h index a939b83516b..fd94d82dc34 100644 --- a/Number_types/include/CGAL/Sqrt_extension/Sqrt_extension_type.h +++ b/Number_types/include/CGAL/Sqrt_extension/Sqrt_extension_type.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/Sqrt_extension/Wang_traits.h b/Number_types/include/CGAL/Sqrt_extension/Wang_traits.h index 85f8df971bf..9c4693b2f84 100644 --- a/Number_types/include/CGAL/Sqrt_extension/Wang_traits.h +++ b/Number_types/include/CGAL/Sqrt_extension/Wang_traits.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/Sqrt_extension/convert_to_bfi.h b/Number_types/include/CGAL/Sqrt_extension/convert_to_bfi.h index 7321a96e35e..4198c3e0986 100644 --- a/Number_types/include/CGAL/Sqrt_extension/convert_to_bfi.h +++ b/Number_types/include/CGAL/Sqrt_extension/convert_to_bfi.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/Sqrt_extension/io.h b/Number_types/include/CGAL/Sqrt_extension/io.h index 8745a1f6de1..8ddd9bfb24a 100644 --- a/Number_types/include/CGAL/Sqrt_extension/io.h +++ b/Number_types/include/CGAL/Sqrt_extension/io.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/Sqrt_extension_fwd.h b/Number_types/include/CGAL/Sqrt_extension_fwd.h index c13fadb7428..3864250b0b5 100644 --- a/Number_types/include/CGAL/Sqrt_extension_fwd.h +++ b/Number_types/include/CGAL/Sqrt_extension_fwd.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/constant.h b/Number_types/include/CGAL/constant.h index e3fd5193f91..953046e36ad 100644 --- a/Number_types/include/CGAL/constant.h +++ b/Number_types/include/CGAL/constant.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/double.h b/Number_types/include/CGAL/double.h index 7174809d6e1..88eb597c8c6 100644 --- a/Number_types/include/CGAL/double.h +++ b/Number_types/include/CGAL/double.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/float.h b/Number_types/include/CGAL/float.h index 0345ce610b3..5d172ff7e4c 100644 --- a/Number_types/include/CGAL/float.h +++ b/Number_types/include/CGAL/float.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/gmp.h b/Number_types/include/CGAL/gmp.h index dc3c3800183..bac2fcba79d 100644 --- a/Number_types/include/CGAL/gmp.h +++ b/Number_types/include/CGAL/gmp.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/gmpxx.h b/Number_types/include/CGAL/gmpxx.h index 53cf55583f4..5f65e85abff 100644 --- a/Number_types/include/CGAL/gmpxx.h +++ b/Number_types/include/CGAL/gmpxx.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/gmpxx_coercion_traits.h b/Number_types/include/CGAL/gmpxx_coercion_traits.h index c248741de80..d1140ec05b4 100644 --- a/Number_types/include/CGAL/gmpxx_coercion_traits.h +++ b/Number_types/include/CGAL/gmpxx_coercion_traits.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/int.h b/Number_types/include/CGAL/int.h index d5d07ea705c..0c5b9703a11 100644 --- a/Number_types/include/CGAL/int.h +++ b/Number_types/include/CGAL/int.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/internal/Exact_type_selector.h b/Number_types/include/CGAL/internal/Exact_type_selector.h index 136721f28d0..d5c57e350ff 100644 --- a/Number_types/include/CGAL/internal/Exact_type_selector.h +++ b/Number_types/include/CGAL/internal/Exact_type_selector.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/known_bit_size_integers.h b/Number_types/include/CGAL/known_bit_size_integers.h index 999d9611f8e..fca64f392c3 100644 --- a/Number_types/include/CGAL/known_bit_size_integers.h +++ b/Number_types/include/CGAL/known_bit_size_integers.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/leda_bigfloat.h b/Number_types/include/CGAL/leda_bigfloat.h index be80e4660ff..736454f2f64 100644 --- a/Number_types/include/CGAL/leda_bigfloat.h +++ b/Number_types/include/CGAL/leda_bigfloat.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/leda_bigfloat_interval.h b/Number_types/include/CGAL/leda_bigfloat_interval.h index d8d42b2bf21..841d68454d3 100644 --- a/Number_types/include/CGAL/leda_bigfloat_interval.h +++ b/Number_types/include/CGAL/leda_bigfloat_interval.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/leda_coercion_traits.h b/Number_types/include/CGAL/leda_coercion_traits.h index cdca6ec4442..7fe27810e4a 100644 --- a/Number_types/include/CGAL/leda_coercion_traits.h +++ b/Number_types/include/CGAL/leda_coercion_traits.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/leda_integer.h b/Number_types/include/CGAL/leda_integer.h index b7ab488047e..cb001216ebe 100644 --- a/Number_types/include/CGAL/leda_integer.h +++ b/Number_types/include/CGAL/leda_integer.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/leda_rational.h b/Number_types/include/CGAL/leda_rational.h index 91c5db8ffff..1e6d73d7788 100644 --- a/Number_types/include/CGAL/leda_rational.h +++ b/Number_types/include/CGAL/leda_rational.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/leda_real.h b/Number_types/include/CGAL/leda_real.h index 8d2ae34a729..2f3b2389685 100644 --- a/Number_types/include/CGAL/leda_real.h +++ b/Number_types/include/CGAL/leda_real.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/long_double.h b/Number_types/include/CGAL/long_double.h index 68983ecff22..86cee88a676 100644 --- a/Number_types/include/CGAL/long_double.h +++ b/Number_types/include/CGAL/long_double.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/long_long.h b/Number_types/include/CGAL/long_long.h index cd8f4e7bedc..2ce7b6996d2 100644 --- a/Number_types/include/CGAL/long_long.h +++ b/Number_types/include/CGAL/long_long.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/mpfi_coercion_traits.h b/Number_types/include/CGAL/mpfi_coercion_traits.h index 8d5fbc629fc..c523065e462 100644 --- a/Number_types/include/CGAL/mpfi_coercion_traits.h +++ b/Number_types/include/CGAL/mpfi_coercion_traits.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/mpfr_coercion_traits.h b/Number_types/include/CGAL/mpfr_coercion_traits.h index 6dc4252edc5..a00986f3457 100644 --- a/Number_types/include/CGAL/mpfr_coercion_traits.h +++ b/Number_types/include/CGAL/mpfr_coercion_traits.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/mpq_class.h b/Number_types/include/CGAL/mpq_class.h index 7bdb0192524..ca276b3130a 100644 --- a/Number_types/include/CGAL/mpq_class.h +++ b/Number_types/include/CGAL/mpq_class.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/mpz_class.h b/Number_types/include/CGAL/mpz_class.h index 25e69b20b8e..8003e6725ea 100644 --- a/Number_types/include/CGAL/mpz_class.h +++ b/Number_types/include/CGAL/mpz_class.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/number_type_basic.h b/Number_types/include/CGAL/number_type_basic.h index 29be5b2577e..cc519fdd392 100644 --- a/Number_types/include/CGAL/number_type_basic.h +++ b/Number_types/include/CGAL/number_type_basic.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/simplest_rational_in_interval.h b/Number_types/include/CGAL/simplest_rational_in_interval.h index aac7668b0f7..55c40239f1b 100644 --- a/Number_types/include/CGAL/simplest_rational_in_interval.h +++ b/Number_types/include/CGAL/simplest_rational_in_interval.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/sse2.h b/Number_types/include/CGAL/sse2.h index b16ac8f4664..acc7ece251a 100644 --- a/Number_types/include/CGAL/sse2.h +++ b/Number_types/include/CGAL/sse2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/to_rational.h b/Number_types/include/CGAL/to_rational.h index 915bf906701..6b79109fe7a 100644 --- a/Number_types/include/CGAL/to_rational.h +++ b/Number_types/include/CGAL/to_rational.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/utils.h b/Number_types/include/CGAL/utils.h index dea6f019692..61faefbd217 100644 --- a/Number_types/include/CGAL/utils.h +++ b/Number_types/include/CGAL/utils.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/include/CGAL/utils_classes.h b/Number_types/include/CGAL/utils_classes.h index 156f7394bc6..6358e17f0a5 100644 --- a/Number_types/include/CGAL/utils_classes.h +++ b/Number_types/include/CGAL/utils_classes.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Number_types/src/CGAL/Interval_arithmetic.cpp b/Number_types/src/CGAL/Interval_arithmetic.cpp index 7f9ce6e5984..50f643cdc7e 100644 --- a/Number_types/src/CGAL/Interval_arithmetic.cpp +++ b/Number_types/src/CGAL/Interval_arithmetic.cpp @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/src/CGAL/MP_Float.cpp b/Number_types/src/CGAL/MP_Float.cpp index a27c55e661e..05a66554639 100644 --- a/Number_types/src/CGAL/MP_Float.cpp +++ b/Number_types/src/CGAL/MP_Float.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/src/CGAL/test_FPU_rounding_mode.cpp b/Number_types/src/CGAL/test_FPU_rounding_mode.cpp index bade5fa13e3..8f347794db3 100644 --- a/Number_types/src/CGAL/test_FPU_rounding_mode.cpp +++ b/Number_types/src/CGAL/test_FPU_rounding_mode.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/test/Number_types/Gmpfi.cpp b/Number_types/test/Number_types/Gmpfi.cpp index 144b22fc760..0ed4c4b692d 100644 --- a/Number_types/test/Number_types/Gmpfi.cpp +++ b/Number_types/test/Number_types/Gmpfi.cpp @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/test/Number_types/Gmpfr.cpp b/Number_types/test/Number_types/Gmpfr.cpp index 53070ad0afb..0412939457f 100644 --- a/Number_types/test/Number_types/Gmpfr.cpp +++ b/Number_types/test/Number_types/Gmpfr.cpp @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/test/Number_types/_test_valid_finite_double.cpp b/Number_types/test/Number_types/_test_valid_finite_double.cpp index fbf7c8a5937..e974c94de52 100644 --- a/Number_types/test/Number_types/_test_valid_finite_double.cpp +++ b/Number_types/test/Number_types/_test_valid_finite_double.cpp @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Number_types/test/Number_types/_test_valid_finite_float.cpp b/Number_types/test/Number_types/_test_valid_finite_float.cpp index b8ebb56508b..1b5c1b1b414 100644 --- a/Number_types/test/Number_types/_test_valid_finite_float.cpp +++ b/Number_types/test/Number_types/_test_valid_finite_float.cpp @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/Number_types/test/Number_types/include/CGAL/_test_io.h b/Number_types/test/Number_types/include/CGAL/_test_io.h index 1b5cc8e9a74..0d3c0d0c71c 100644 --- a/Number_types/test/Number_types/include/CGAL/_test_io.h +++ b/Number_types/test/Number_types/include/CGAL/_test_io.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Number_types/test/Number_types/include/CGAL/_test_utilities.h b/Number_types/test/Number_types/include/CGAL/_test_utilities.h index bd562ed3fb4..7a6ce5f2967 100644 --- a/Number_types/test/Number_types/include/CGAL/_test_utilities.h +++ b/Number_types/test/Number_types/include/CGAL/_test_utilities.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/OpenNL/include/CGAL/OpenNL/bicgstab.h b/OpenNL/include/CGAL/OpenNL/bicgstab.h index fdb84c13e14..1bec5742e4c 100644 --- a/OpenNL/include/CGAL/OpenNL/bicgstab.h +++ b/OpenNL/include/CGAL/OpenNL/bicgstab.h @@ -4,7 +4,7 @@ * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation + * License version 3 as published by the Free Software Foundation * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/OpenNL/include/CGAL/OpenNL/blas.h b/OpenNL/include/CGAL/OpenNL/blas.h index 3701b84299b..5353ab4c4af 100644 --- a/OpenNL/include/CGAL/OpenNL/blas.h +++ b/OpenNL/include/CGAL/OpenNL/blas.h @@ -4,7 +4,7 @@ * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation + * License version 3 as published by the Free Software Foundation * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/OpenNL/include/CGAL/OpenNL/conjugate_gradient.h b/OpenNL/include/CGAL/OpenNL/conjugate_gradient.h index e3066ffb7ad..87005480065 100644 --- a/OpenNL/include/CGAL/OpenNL/conjugate_gradient.h +++ b/OpenNL/include/CGAL/OpenNL/conjugate_gradient.h @@ -4,7 +4,7 @@ * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation + * License version 3 as published by the Free Software Foundation * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/OpenNL/include/CGAL/OpenNL/full_vector.h b/OpenNL/include/CGAL/OpenNL/full_vector.h index 66dbfbd8b16..2271c124678 100644 --- a/OpenNL/include/CGAL/OpenNL/full_vector.h +++ b/OpenNL/include/CGAL/OpenNL/full_vector.h @@ -4,7 +4,7 @@ * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation + * License version 3 as published by the Free Software Foundation * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/OpenNL/include/CGAL/OpenNL/linear_solver.h b/OpenNL/include/CGAL/OpenNL/linear_solver.h index 8da22dd470d..38aa96611c5 100644 --- a/OpenNL/include/CGAL/OpenNL/linear_solver.h +++ b/OpenNL/include/CGAL/OpenNL/linear_solver.h @@ -4,7 +4,7 @@ * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation + * License version 3 as published by the Free Software Foundation * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/OpenNL/include/CGAL/OpenNL/preconditioner.h b/OpenNL/include/CGAL/OpenNL/preconditioner.h index c02a34657e7..a1f2202fead 100644 --- a/OpenNL/include/CGAL/OpenNL/preconditioner.h +++ b/OpenNL/include/CGAL/OpenNL/preconditioner.h @@ -4,7 +4,7 @@ * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation + * License version 3 as published by the Free Software Foundation * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/OpenNL/include/CGAL/OpenNL/sparse_matrix.h b/OpenNL/include/CGAL/OpenNL/sparse_matrix.h index a9396a71670..3a7db5c73dd 100644 --- a/OpenNL/include/CGAL/OpenNL/sparse_matrix.h +++ b/OpenNL/include/CGAL/OpenNL/sparse_matrix.h @@ -4,7 +4,7 @@ * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation + * License version 3 as published by the Free Software Foundation * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/Optimisation_basic/include/CGAL/Optimisation/Access_coordinates_begin_2.h b/Optimisation_basic/include/CGAL/Optimisation/Access_coordinates_begin_2.h index 6844384bc5f..c144c5c9c49 100644 --- a/Optimisation_basic/include/CGAL/Optimisation/Access_coordinates_begin_2.h +++ b/Optimisation_basic/include/CGAL/Optimisation/Access_coordinates_begin_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Optimisation_basic/include/CGAL/Optimisation/Access_coordinates_begin_3.h b/Optimisation_basic/include/CGAL/Optimisation/Access_coordinates_begin_3.h index aa3bac0ae88..1136850c565 100644 --- a/Optimisation_basic/include/CGAL/Optimisation/Access_coordinates_begin_3.h +++ b/Optimisation_basic/include/CGAL/Optimisation/Access_coordinates_begin_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Optimisation_basic/include/CGAL/Optimisation/Access_coordinates_begin_d.h b/Optimisation_basic/include/CGAL/Optimisation/Access_coordinates_begin_d.h index 236bbe4185d..d7121b1c20e 100644 --- a/Optimisation_basic/include/CGAL/Optimisation/Access_coordinates_begin_d.h +++ b/Optimisation_basic/include/CGAL/Optimisation/Access_coordinates_begin_d.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Optimisation_basic/include/CGAL/Optimisation/Access_dimension_2.h b/Optimisation_basic/include/CGAL/Optimisation/Access_dimension_2.h index 40746ca16f5..759d1bae536 100644 --- a/Optimisation_basic/include/CGAL/Optimisation/Access_dimension_2.h +++ b/Optimisation_basic/include/CGAL/Optimisation/Access_dimension_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Optimisation_basic/include/CGAL/Optimisation/Access_dimension_3.h b/Optimisation_basic/include/CGAL/Optimisation/Access_dimension_3.h index a67cca220a7..b25968d3ade 100644 --- a/Optimisation_basic/include/CGAL/Optimisation/Access_dimension_3.h +++ b/Optimisation_basic/include/CGAL/Optimisation/Access_dimension_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Optimisation_basic/include/CGAL/Optimisation/Access_dimension_d.h b/Optimisation_basic/include/CGAL/Optimisation/Access_dimension_d.h index 543899c9e2f..abb01518591 100644 --- a/Optimisation_basic/include/CGAL/Optimisation/Access_dimension_d.h +++ b/Optimisation_basic/include/CGAL/Optimisation/Access_dimension_d.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Optimisation_basic/include/CGAL/Optimisation/Construct_point_2.h b/Optimisation_basic/include/CGAL/Optimisation/Construct_point_2.h index 9485d40548f..526e418abe4 100644 --- a/Optimisation_basic/include/CGAL/Optimisation/Construct_point_2.h +++ b/Optimisation_basic/include/CGAL/Optimisation/Construct_point_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Optimisation_basic/include/CGAL/Optimisation/Construct_point_3.h b/Optimisation_basic/include/CGAL/Optimisation/Construct_point_3.h index c1650e6031f..ffe54e39900 100644 --- a/Optimisation_basic/include/CGAL/Optimisation/Construct_point_3.h +++ b/Optimisation_basic/include/CGAL/Optimisation/Construct_point_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Optimisation_basic/include/CGAL/Optimisation/Construct_point_d.h b/Optimisation_basic/include/CGAL/Optimisation/Construct_point_d.h index 13d6ffdba54..1c481365e90 100644 --- a/Optimisation_basic/include/CGAL/Optimisation/Construct_point_d.h +++ b/Optimisation_basic/include/CGAL/Optimisation/Construct_point_d.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Optimisation_basic/include/CGAL/Optimisation/assertions.h b/Optimisation_basic/include/CGAL/Optimisation/assertions.h index f2b4057164d..05023829bf9 100644 --- a/Optimisation_basic/include/CGAL/Optimisation/assertions.h +++ b/Optimisation_basic/include/CGAL/Optimisation/assertions.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Optimisation_basic/include/CGAL/Optimisation/basic.h b/Optimisation_basic/include/CGAL/Optimisation/basic.h index 4bb01017d92..65884e1a45a 100644 --- a/Optimisation_basic/include/CGAL/Optimisation/basic.h +++ b/Optimisation_basic/include/CGAL/Optimisation/basic.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Optimisation_basic/include/CGAL/Optimisation/debug.h b/Optimisation_basic/include/CGAL/Optimisation/debug.h index fa1ace74949..e6a3c5537d1 100644 --- a/Optimisation_basic/include/CGAL/Optimisation/debug.h +++ b/Optimisation_basic/include/CGAL/Optimisation/debug.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Optimisation_basic/include/CGAL/Optimisation_d_traits_2.h b/Optimisation_basic/include/CGAL/Optimisation_d_traits_2.h index 3364aa27213..23971c294cc 100644 --- a/Optimisation_basic/include/CGAL/Optimisation_d_traits_2.h +++ b/Optimisation_basic/include/CGAL/Optimisation_d_traits_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Optimisation_basic/include/CGAL/Optimisation_d_traits_3.h b/Optimisation_basic/include/CGAL/Optimisation_d_traits_3.h index dfa5183fc6d..29f9fa2b731 100644 --- a/Optimisation_basic/include/CGAL/Optimisation_d_traits_3.h +++ b/Optimisation_basic/include/CGAL/Optimisation_d_traits_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Optimisation_basic/include/CGAL/Optimisation_d_traits_d.h b/Optimisation_basic/include/CGAL/Optimisation_d_traits_d.h index b7fb872f3a9..c5eca59e554 100644 --- a/Optimisation_basic/include/CGAL/Optimisation_d_traits_d.h +++ b/Optimisation_basic/include/CGAL/Optimisation_d_traits_d.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Polygon/include/CGAL/Polygon_2.h b/Polygon/include/CGAL/Polygon_2.h index 34edbedad5d..9e222b6d238 100644 --- a/Polygon/include/CGAL/Polygon_2.h +++ b/Polygon/include/CGAL/Polygon_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Polygon/include/CGAL/Polygon_2/Polygon_2_algorithms_impl.h b/Polygon/include/CGAL/Polygon_2/Polygon_2_algorithms_impl.h index 16a577410d3..1d6ac69239a 100644 --- a/Polygon/include/CGAL/Polygon_2/Polygon_2_algorithms_impl.h +++ b/Polygon/include/CGAL/Polygon_2/Polygon_2_algorithms_impl.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Polygon/include/CGAL/Polygon_2/Polygon_2_edge_circulator.h b/Polygon/include/CGAL/Polygon_2/Polygon_2_edge_circulator.h index dbef608a2db..b70ee5a273c 100644 --- a/Polygon/include/CGAL/Polygon_2/Polygon_2_edge_circulator.h +++ b/Polygon/include/CGAL/Polygon_2/Polygon_2_edge_circulator.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Polygon/include/CGAL/Polygon_2/Polygon_2_edge_iterator.h b/Polygon/include/CGAL/Polygon_2/Polygon_2_edge_iterator.h index b274e477cd2..e2d0c8d01f5 100644 --- a/Polygon/include/CGAL/Polygon_2/Polygon_2_edge_iterator.h +++ b/Polygon/include/CGAL/Polygon_2/Polygon_2_edge_iterator.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Polygon/include/CGAL/Polygon_2/Polygon_2_impl.h b/Polygon/include/CGAL/Polygon_2/Polygon_2_impl.h index 1feba0c6be7..add348aad03 100644 --- a/Polygon/include/CGAL/Polygon_2/Polygon_2_impl.h +++ b/Polygon/include/CGAL/Polygon_2/Polygon_2_impl.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Polygon/include/CGAL/Polygon_2/Polygon_2_simplicity.h b/Polygon/include/CGAL/Polygon_2/Polygon_2_simplicity.h index fad1750e7ad..a933659bea8 100644 --- a/Polygon/include/CGAL/Polygon_2/Polygon_2_simplicity.h +++ b/Polygon/include/CGAL/Polygon_2/Polygon_2_simplicity.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Polygon/include/CGAL/Polygon_2/Polygon_2_vertex_circulator.h b/Polygon/include/CGAL/Polygon_2/Polygon_2_vertex_circulator.h index b031a6d4573..fde39f3a262 100644 --- a/Polygon/include/CGAL/Polygon_2/Polygon_2_vertex_circulator.h +++ b/Polygon/include/CGAL/Polygon_2/Polygon_2_vertex_circulator.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Polygon/include/CGAL/Polygon_2/polygon_assertions.h b/Polygon/include/CGAL/Polygon_2/polygon_assertions.h index 609080f20bb..75724993875 100644 --- a/Polygon/include/CGAL/Polygon_2/polygon_assertions.h +++ b/Polygon/include/CGAL/Polygon_2/polygon_assertions.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Polygon/include/CGAL/Polygon_2_algorithms.h b/Polygon/include/CGAL/Polygon_2_algorithms.h index 2b659ce0ce6..a5723ba196f 100644 --- a/Polygon/include/CGAL/Polygon_2_algorithms.h +++ b/Polygon/include/CGAL/Polygon_2_algorithms.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Polygon/include/CGAL/Polygon_traits_2.h b/Polygon/include/CGAL/Polygon_traits_2.h index 4902f8ece73..06b2e761559 100644 --- a/Polygon/include/CGAL/Polygon_traits_2.h +++ b/Polygon/include/CGAL/Polygon_traits_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Polyhedron/demo/Polyhedron/opengl_tools.h b/Polyhedron/demo/Polyhedron/opengl_tools.h index f46a21b28ff..550c622f01c 100644 --- a/Polyhedron/demo/Polyhedron/opengl_tools.h +++ b/Polyhedron/demo/Polyhedron/opengl_tools.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Polynomial/include/CGAL/Exponent_vector.h b/Polynomial/include/CGAL/Exponent_vector.h index eaa67cb271e..41411ef6dd9 100644 --- a/Polynomial/include/CGAL/Exponent_vector.h +++ b/Polynomial/include/CGAL/Exponent_vector.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Polynomial/include/CGAL/Polynomial.h b/Polynomial/include/CGAL/Polynomial.h index 7fe1ee8b608..76ce642b0e1 100644 --- a/Polynomial/include/CGAL/Polynomial.h +++ b/Polynomial/include/CGAL/Polynomial.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Polynomial/include/CGAL/Polynomial/Algebraic_structure_traits.h b/Polynomial/include/CGAL/Polynomial/Algebraic_structure_traits.h index b969c87a2d0..0c7e50b83ec 100644 --- a/Polynomial/include/CGAL/Polynomial/Algebraic_structure_traits.h +++ b/Polynomial/include/CGAL/Polynomial/Algebraic_structure_traits.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Polynomial/include/CGAL/Polynomial/Cached_extended_euclidean_algorithm.h b/Polynomial/include/CGAL/Polynomial/Cached_extended_euclidean_algorithm.h index 5b31841382f..7b00695a2e4 100644 --- a/Polynomial/include/CGAL/Polynomial/Cached_extended_euclidean_algorithm.h +++ b/Polynomial/include/CGAL/Polynomial/Cached_extended_euclidean_algorithm.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Polynomial/include/CGAL/Polynomial/Chinese_remainder_traits.h b/Polynomial/include/CGAL/Polynomial/Chinese_remainder_traits.h index ceb2d38762b..c9e2fc7292e 100644 --- a/Polynomial/include/CGAL/Polynomial/Chinese_remainder_traits.h +++ b/Polynomial/include/CGAL/Polynomial/Chinese_remainder_traits.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Polynomial/include/CGAL/Polynomial/Coercion_traits.h b/Polynomial/include/CGAL/Polynomial/Coercion_traits.h index 1ab797c18d3..1942164867b 100644 --- a/Polynomial/include/CGAL/Polynomial/Coercion_traits.h +++ b/Polynomial/include/CGAL/Polynomial/Coercion_traits.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Polynomial/include/CGAL/Polynomial/Degree.h b/Polynomial/include/CGAL/Polynomial/Degree.h index ac318647b8d..ff0d0186a5b 100644 --- a/Polynomial/include/CGAL/Polynomial/Degree.h +++ b/Polynomial/include/CGAL/Polynomial/Degree.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Polynomial/include/CGAL/Polynomial/Fraction_traits.h b/Polynomial/include/CGAL/Polynomial/Fraction_traits.h index 7a31f7adc2a..b13ff0cf776 100644 --- a/Polynomial/include/CGAL/Polynomial/Fraction_traits.h +++ b/Polynomial/include/CGAL/Polynomial/Fraction_traits.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Polynomial/include/CGAL/Polynomial/Get_arithmetic_kernel.h b/Polynomial/include/CGAL/Polynomial/Get_arithmetic_kernel.h index 3ccd5671897..f9aa420d38f 100644 --- a/Polynomial/include/CGAL/Polynomial/Get_arithmetic_kernel.h +++ b/Polynomial/include/CGAL/Polynomial/Get_arithmetic_kernel.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Polynomial/include/CGAL/Polynomial/Interpolator.h b/Polynomial/include/CGAL/Polynomial/Interpolator.h index c02c4dd7b94..295d7366a0e 100644 --- a/Polynomial/include/CGAL/Polynomial/Interpolator.h +++ b/Polynomial/include/CGAL/Polynomial/Interpolator.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Polynomial/include/CGAL/Polynomial/Modular_traits.h b/Polynomial/include/CGAL/Polynomial/Modular_traits.h index 88795a92965..8048f5c5ffb 100644 --- a/Polynomial/include/CGAL/Polynomial/Modular_traits.h +++ b/Polynomial/include/CGAL/Polynomial/Modular_traits.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Polynomial/include/CGAL/Polynomial/Monomial_representation.h b/Polynomial/include/CGAL/Polynomial/Monomial_representation.h index e335bb76dc7..6e4da89a7b8 100644 --- a/Polynomial/include/CGAL/Polynomial/Monomial_representation.h +++ b/Polynomial/include/CGAL/Polynomial/Monomial_representation.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Polynomial/include/CGAL/Polynomial/Polynomial_type.h b/Polynomial/include/CGAL/Polynomial/Polynomial_type.h index c5aed1e00de..226d5ccd209 100644 --- a/Polynomial/include/CGAL/Polynomial/Polynomial_type.h +++ b/Polynomial/include/CGAL/Polynomial/Polynomial_type.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Polynomial/include/CGAL/Polynomial/Real_embeddable_traits.h b/Polynomial/include/CGAL/Polynomial/Real_embeddable_traits.h index 23f9de64bf2..28413d94799 100644 --- a/Polynomial/include/CGAL/Polynomial/Real_embeddable_traits.h +++ b/Polynomial/include/CGAL/Polynomial/Real_embeddable_traits.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Polynomial/include/CGAL/Polynomial/Scalar_factor_traits.h b/Polynomial/include/CGAL/Polynomial/Scalar_factor_traits.h index 0aee114aa35..8ad609a1b8d 100644 --- a/Polynomial/include/CGAL/Polynomial/Scalar_factor_traits.h +++ b/Polynomial/include/CGAL/Polynomial/Scalar_factor_traits.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Polynomial/include/CGAL/Polynomial/Wang_traits.h b/Polynomial/include/CGAL/Polynomial/Wang_traits.h index 78e1b042bd6..5696ab8e57d 100644 --- a/Polynomial/include/CGAL/Polynomial/Wang_traits.h +++ b/Polynomial/include/CGAL/Polynomial/Wang_traits.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Polynomial/include/CGAL/Polynomial/bezout_matrix.h b/Polynomial/include/CGAL/Polynomial/bezout_matrix.h index 487701f4fdd..4a2f57ff6cf 100644 --- a/Polynomial/include/CGAL/Polynomial/bezout_matrix.h +++ b/Polynomial/include/CGAL/Polynomial/bezout_matrix.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Polynomial/include/CGAL/Polynomial/determinant.h b/Polynomial/include/CGAL/Polynomial/determinant.h index 68ac817f66e..d357973cb4e 100644 --- a/Polynomial/include/CGAL/Polynomial/determinant.h +++ b/Polynomial/include/CGAL/Polynomial/determinant.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Polynomial/include/CGAL/Polynomial/fwd.h b/Polynomial/include/CGAL/Polynomial/fwd.h index 0f45e2b5319..988bde48669 100644 --- a/Polynomial/include/CGAL/Polynomial/fwd.h +++ b/Polynomial/include/CGAL/Polynomial/fwd.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Polynomial/include/CGAL/Polynomial/hgdelta_update.h b/Polynomial/include/CGAL/Polynomial/hgdelta_update.h index 5c9a9f84229..2207720e288 100644 --- a/Polynomial/include/CGAL/Polynomial/hgdelta_update.h +++ b/Polynomial/include/CGAL/Polynomial/hgdelta_update.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Polynomial/include/CGAL/Polynomial/misc.h b/Polynomial/include/CGAL/Polynomial/misc.h index e3956632460..7f20296df49 100644 --- a/Polynomial/include/CGAL/Polynomial/misc.h +++ b/Polynomial/include/CGAL/Polynomial/misc.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Polynomial/include/CGAL/Polynomial/modular_filter.h b/Polynomial/include/CGAL/Polynomial/modular_filter.h index d60f64f91a1..51fee794e27 100644 --- a/Polynomial/include/CGAL/Polynomial/modular_filter.h +++ b/Polynomial/include/CGAL/Polynomial/modular_filter.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Polynomial/include/CGAL/Polynomial/modular_gcd.h b/Polynomial/include/CGAL/Polynomial/modular_gcd.h index 781f9ab68c3..030e7d51081 100644 --- a/Polynomial/include/CGAL/Polynomial/modular_gcd.h +++ b/Polynomial/include/CGAL/Polynomial/modular_gcd.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Polynomial/include/CGAL/Polynomial/modular_gcd_utcf_algorithm_M.h b/Polynomial/include/CGAL/Polynomial/modular_gcd_utcf_algorithm_M.h index 05ea2936cbd..910b73891b2 100644 --- a/Polynomial/include/CGAL/Polynomial/modular_gcd_utcf_algorithm_M.h +++ b/Polynomial/include/CGAL/Polynomial/modular_gcd_utcf_algorithm_M.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Polynomial/include/CGAL/Polynomial/modular_gcd_utcf_dfai.h b/Polynomial/include/CGAL/Polynomial/modular_gcd_utcf_dfai.h index 140cd7967bb..d349fed57d0 100644 --- a/Polynomial/include/CGAL/Polynomial/modular_gcd_utcf_dfai.h +++ b/Polynomial/include/CGAL/Polynomial/modular_gcd_utcf_dfai.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Polynomial/include/CGAL/Polynomial/modular_gcd_utcf_pure_wang.h b/Polynomial/include/CGAL/Polynomial/modular_gcd_utcf_pure_wang.h index 96aa2f72b49..fa534e33506 100644 --- a/Polynomial/include/CGAL/Polynomial/modular_gcd_utcf_pure_wang.h +++ b/Polynomial/include/CGAL/Polynomial/modular_gcd_utcf_pure_wang.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Polynomial/include/CGAL/Polynomial/modular_gcd_utcf_with_wang.h b/Polynomial/include/CGAL/Polynomial/modular_gcd_utcf_with_wang.h index 2048e16c8af..ab64aaad4f4 100644 --- a/Polynomial/include/CGAL/Polynomial/modular_gcd_utcf_with_wang.h +++ b/Polynomial/include/CGAL/Polynomial/modular_gcd_utcf_with_wang.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Polynomial/include/CGAL/Polynomial/modular_gcd_utils.h b/Polynomial/include/CGAL/Polynomial/modular_gcd_utils.h index baacaf6722d..e190764ced5 100644 --- a/Polynomial/include/CGAL/Polynomial/modular_gcd_utils.h +++ b/Polynomial/include/CGAL/Polynomial/modular_gcd_utils.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Polynomial/include/CGAL/Polynomial/polynomial_functions.h b/Polynomial/include/CGAL/Polynomial/polynomial_functions.h index d1faf4fc85f..f9cd8635b4e 100644 --- a/Polynomial/include/CGAL/Polynomial/polynomial_functions.h +++ b/Polynomial/include/CGAL/Polynomial/polynomial_functions.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Polynomial/include/CGAL/Polynomial/polynomial_gcd.h b/Polynomial/include/CGAL/Polynomial/polynomial_gcd.h index 4f793b923a1..f4b8fae6e8e 100644 --- a/Polynomial/include/CGAL/Polynomial/polynomial_gcd.h +++ b/Polynomial/include/CGAL/Polynomial/polynomial_gcd.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Polynomial/include/CGAL/Polynomial/polynomial_gcd_implementations.h b/Polynomial/include/CGAL/Polynomial/polynomial_gcd_implementations.h index 16d7a6cfc49..059b82e6115 100644 --- a/Polynomial/include/CGAL/Polynomial/polynomial_gcd_implementations.h +++ b/Polynomial/include/CGAL/Polynomial/polynomial_gcd_implementations.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Polynomial/include/CGAL/Polynomial/polynomial_gcd_ntl.h b/Polynomial/include/CGAL/Polynomial/polynomial_gcd_ntl.h index 338746b4b98..91bbf41ed59 100644 --- a/Polynomial/include/CGAL/Polynomial/polynomial_gcd_ntl.h +++ b/Polynomial/include/CGAL/Polynomial/polynomial_gcd_ntl.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Polynomial/include/CGAL/Polynomial/prs_resultant.h b/Polynomial/include/CGAL/Polynomial/prs_resultant.h index f1e77e1f4dc..857f0268cc7 100644 --- a/Polynomial/include/CGAL/Polynomial/prs_resultant.h +++ b/Polynomial/include/CGAL/Polynomial/prs_resultant.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Polynomial/include/CGAL/Polynomial/resultant.h b/Polynomial/include/CGAL/Polynomial/resultant.h index 5f97b9c4804..eb026f48a66 100644 --- a/Polynomial/include/CGAL/Polynomial/resultant.h +++ b/Polynomial/include/CGAL/Polynomial/resultant.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Polynomial/include/CGAL/Polynomial/sturm_habicht_sequence.h b/Polynomial/include/CGAL/Polynomial/sturm_habicht_sequence.h index 01268dc42bd..0bcf5f4354c 100644 --- a/Polynomial/include/CGAL/Polynomial/sturm_habicht_sequence.h +++ b/Polynomial/include/CGAL/Polynomial/sturm_habicht_sequence.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Polynomial/include/CGAL/Polynomial/subresultants.h b/Polynomial/include/CGAL/Polynomial/subresultants.h index 6f906c25c6e..6a2b65d44a5 100644 --- a/Polynomial/include/CGAL/Polynomial/subresultants.h +++ b/Polynomial/include/CGAL/Polynomial/subresultants.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Polynomial/include/CGAL/Polynomial/wang.h b/Polynomial/include/CGAL/Polynomial/wang.h index cde54da9e6e..8d32c0895fe 100644 --- a/Polynomial/include/CGAL/Polynomial/wang.h +++ b/Polynomial/include/CGAL/Polynomial/wang.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Polynomial/include/CGAL/Polynomial_traits_d.h b/Polynomial/include/CGAL/Polynomial_traits_d.h index 47cfbb16818..18002dc90aa 100644 --- a/Polynomial/include/CGAL/Polynomial_traits_d.h +++ b/Polynomial/include/CGAL/Polynomial_traits_d.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Polynomial/include/CGAL/Polynomial_type_generator.h b/Polynomial/include/CGAL/Polynomial_type_generator.h index d9c6046dedb..5456f7d4b1b 100644 --- a/Polynomial/include/CGAL/Polynomial_type_generator.h +++ b/Polynomial/include/CGAL/Polynomial_type_generator.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Polynomial/include/CGAL/polynomial_utils.h b/Polynomial/include/CGAL/polynomial_utils.h index e11c42c4c3f..0f6fcbd5cdd 100644 --- a/Polynomial/include/CGAL/polynomial_utils.h +++ b/Polynomial/include/CGAL/polynomial_utils.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Polytope_distance_d/include/CGAL/Polytope_distance_d_traits_2.h b/Polytope_distance_d/include/CGAL/Polytope_distance_d_traits_2.h index 9a29ed1474a..144730bc916 100644 --- a/Polytope_distance_d/include/CGAL/Polytope_distance_d_traits_2.h +++ b/Polytope_distance_d/include/CGAL/Polytope_distance_d_traits_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Polytope_distance_d/include/CGAL/Polytope_distance_d_traits_3.h b/Polytope_distance_d/include/CGAL/Polytope_distance_d_traits_3.h index 2d143925c0a..eb8603823a8 100644 --- a/Polytope_distance_d/include/CGAL/Polytope_distance_d_traits_3.h +++ b/Polytope_distance_d/include/CGAL/Polytope_distance_d_traits_3.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Polytope_distance_d/include/CGAL/Polytope_distance_d_traits_d.h b/Polytope_distance_d/include/CGAL/Polytope_distance_d_traits_d.h index f959d9de179..ef9815cd971 100644 --- a/Polytope_distance_d/include/CGAL/Polytope_distance_d_traits_d.h +++ b/Polytope_distance_d/include/CGAL/Polytope_distance_d_traits_d.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Principal_component_analysis/include/CGAL/barycenter.h b/Principal_component_analysis/include/CGAL/barycenter.h index 83a092d1020..002c9627c85 100644 --- a/Principal_component_analysis/include/CGAL/barycenter.h +++ b/Principal_component_analysis/include/CGAL/barycenter.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Principal_component_analysis/include/CGAL/bounding_box.h b/Principal_component_analysis/include/CGAL/bounding_box.h index 7a6960b23d7..ebc64951895 100644 --- a/Principal_component_analysis/include/CGAL/bounding_box.h +++ b/Principal_component_analysis/include/CGAL/bounding_box.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Principal_component_analysis/include/CGAL/centroid.h b/Principal_component_analysis/include/CGAL/centroid.h index 6d0fb284b5a..f23ad7b3046 100644 --- a/Principal_component_analysis/include/CGAL/centroid.h +++ b/Principal_component_analysis/include/CGAL/centroid.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Principal_component_analysis/include/CGAL/eigen.h b/Principal_component_analysis/include/CGAL/eigen.h index eef9da2717a..24bccf06a2c 100644 --- a/Principal_component_analysis/include/CGAL/eigen.h +++ b/Principal_component_analysis/include/CGAL/eigen.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Principal_component_analysis/include/CGAL/eigen_2.h b/Principal_component_analysis/include/CGAL/eigen_2.h index 584c906508e..2ff643dc1d6 100644 --- a/Principal_component_analysis/include/CGAL/eigen_2.h +++ b/Principal_component_analysis/include/CGAL/eigen_2.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Profiling_tools/include/CGAL/Memory_sizer.h b/Profiling_tools/include/CGAL/Memory_sizer.h index c18cdb6797e..b4d64ecb895 100644 --- a/Profiling_tools/include/CGAL/Memory_sizer.h +++ b/Profiling_tools/include/CGAL/Memory_sizer.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Profiling_tools/include/CGAL/Profile_counter.h b/Profiling_tools/include/CGAL/Profile_counter.h index 67c8f323c88..b4ee13ae604 100644 --- a/Profiling_tools/include/CGAL/Profile_counter.h +++ b/Profiling_tools/include/CGAL/Profile_counter.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Profiling_tools/include/CGAL/Profile_timer.h b/Profiling_tools/include/CGAL/Profile_timer.h index b7fac8ec87a..2129f3a260e 100644 --- a/Profiling_tools/include/CGAL/Profile_timer.h +++ b/Profiling_tools/include/CGAL/Profile_timer.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Profiling_tools/include/CGAL/Real_timer.h b/Profiling_tools/include/CGAL/Real_timer.h index 2bd3e734857..130f36d0aa3 100644 --- a/Profiling_tools/include/CGAL/Real_timer.h +++ b/Profiling_tools/include/CGAL/Real_timer.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Profiling_tools/include/CGAL/Timer.h b/Profiling_tools/include/CGAL/Timer.h index b4d3ee7a37d..4e63563c202 100644 --- a/Profiling_tools/include/CGAL/Timer.h +++ b/Profiling_tools/include/CGAL/Timer.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Profiling_tools/src/CGAL/Real_timer.cpp b/Profiling_tools/src/CGAL/Real_timer.cpp index 77c93365930..e0a258b42bc 100644 --- a/Profiling_tools/src/CGAL/Real_timer.cpp +++ b/Profiling_tools/src/CGAL/Real_timer.cpp @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Profiling_tools/src/CGAL/Timer.cpp b/Profiling_tools/src/CGAL/Timer.cpp index 58987b6033f..290d4f13cdf 100644 --- a/Profiling_tools/src/CGAL/Timer.cpp +++ b/Profiling_tools/src/CGAL/Timer.cpp @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/demo/Qt_widget/hellosegment.cpp b/Qt_widget/demo/Qt_widget/hellosegment.cpp index 527661fa42c..4146f0b1550 100644 --- a/Qt_widget/demo/Qt_widget/hellosegment.cpp +++ b/Qt_widget/demo/Qt_widget/hellosegment.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/demo/Qt_widget/layer.cpp b/Qt_widget/demo/Qt_widget/layer.cpp index 67ed60ca0ea..42d5a978e8e 100644 --- a/Qt_widget/demo/Qt_widget/layer.cpp +++ b/Qt_widget/demo/Qt_widget/layer.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/demo/Qt_widget/standard_toolbar.cpp b/Qt_widget/demo/Qt_widget/standard_toolbar.cpp index be971b63562..871488f4e0a 100644 --- a/Qt_widget/demo/Qt_widget/standard_toolbar.cpp +++ b/Qt_widget/demo/Qt_widget/standard_toolbar.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/demo/Qt_widget/tutorial2.cpp b/Qt_widget/demo/Qt_widget/tutorial2.cpp index 62cd4cc27a9..40173aa6210 100644 --- a/Qt_widget/demo/Qt_widget/tutorial2.cpp +++ b/Qt_widget/demo/Qt_widget/tutorial2.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/include/CGAL/IO/Custom_zoom_layer.h b/Qt_widget/include/CGAL/IO/Custom_zoom_layer.h index 73f2536d5a1..17ebb306034 100644 --- a/Qt_widget/include/CGAL/IO/Custom_zoom_layer.h +++ b/Qt_widget/include/CGAL/IO/Custom_zoom_layer.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/include/CGAL/IO/Navigation_layer.h b/Qt_widget/include/CGAL/IO/Navigation_layer.h index 09765693d36..1287121578d 100644 --- a/Qt_widget/include/CGAL/IO/Navigation_layer.h +++ b/Qt_widget/include/CGAL/IO/Navigation_layer.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/include/CGAL/IO/Qt_help_window.h b/Qt_widget/include/CGAL/IO/Qt_help_window.h index 54e1d6b07bd..7a95a9bd60c 100644 --- a/Qt_widget/include/CGAL/IO/Qt_help_window.h +++ b/Qt_widget/include/CGAL/IO/Qt_help_window.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/include/CGAL/IO/Qt_widget.h b/Qt_widget/include/CGAL/IO/Qt_widget.h index 617f32ab16f..c1f0cb41197 100644 --- a/Qt_widget/include/CGAL/IO/Qt_widget.h +++ b/Qt_widget/include/CGAL/IO/Qt_widget.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/include/CGAL/IO/Qt_widget_Alpha_shape_2.h b/Qt_widget/include/CGAL/IO/Qt_widget_Alpha_shape_2.h index 99382280532..a2ee37538de 100644 --- a/Qt_widget/include/CGAL/IO/Qt_widget_Alpha_shape_2.h +++ b/Qt_widget/include/CGAL/IO/Qt_widget_Alpha_shape_2.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/include/CGAL/IO/Qt_widget_Conic_2.h b/Qt_widget/include/CGAL/IO/Qt_widget_Conic_2.h index 8d493103837..5bb6a6c0f39 100644 --- a/Qt_widget/include/CGAL/IO/Qt_widget_Conic_2.h +++ b/Qt_widget/include/CGAL/IO/Qt_widget_Conic_2.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/include/CGAL/IO/Qt_widget_Constrained_triangulation_2.h b/Qt_widget/include/CGAL/IO/Qt_widget_Constrained_triangulation_2.h index 46aff983dd0..7b129ca848c 100644 --- a/Qt_widget/include/CGAL/IO/Qt_widget_Constrained_triangulation_2.h +++ b/Qt_widget/include/CGAL/IO/Qt_widget_Constrained_triangulation_2.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/include/CGAL/IO/Qt_widget_Delaunay_triangulation_2.h b/Qt_widget/include/CGAL/IO/Qt_widget_Delaunay_triangulation_2.h index 8294795bea8..8dd22542ebe 100644 --- a/Qt_widget/include/CGAL/IO/Qt_widget_Delaunay_triangulation_2.h +++ b/Qt_widget/include/CGAL/IO/Qt_widget_Delaunay_triangulation_2.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/include/CGAL/IO/Qt_widget_Min_ellipse_2.h b/Qt_widget/include/CGAL/IO/Qt_widget_Min_ellipse_2.h index 298feddd70e..a54edb68f17 100644 --- a/Qt_widget/include/CGAL/IO/Qt_widget_Min_ellipse_2.h +++ b/Qt_widget/include/CGAL/IO/Qt_widget_Min_ellipse_2.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/include/CGAL/IO/Qt_widget_Nef_2.h b/Qt_widget/include/CGAL/IO/Qt_widget_Nef_2.h index b4c3e46720a..101701bbeba 100644 --- a/Qt_widget/include/CGAL/IO/Qt_widget_Nef_2.h +++ b/Qt_widget/include/CGAL/IO/Qt_widget_Nef_2.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/include/CGAL/IO/Qt_widget_Optimisation_circle_2.h b/Qt_widget/include/CGAL/IO/Qt_widget_Optimisation_circle_2.h index e265b3f7ab3..0d0f2840eb5 100644 --- a/Qt_widget/include/CGAL/IO/Qt_widget_Optimisation_circle_2.h +++ b/Qt_widget/include/CGAL/IO/Qt_widget_Optimisation_circle_2.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/include/CGAL/IO/Qt_widget_Optimisation_ellipse_2.h b/Qt_widget/include/CGAL/IO/Qt_widget_Optimisation_ellipse_2.h index 58153d441b5..788ff8fc703 100644 --- a/Qt_widget/include/CGAL/IO/Qt_widget_Optimisation_ellipse_2.h +++ b/Qt_widget/include/CGAL/IO/Qt_widget_Optimisation_ellipse_2.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/include/CGAL/IO/Qt_widget_Polygon_2.h b/Qt_widget/include/CGAL/IO/Qt_widget_Polygon_2.h index 42f18e6e50a..a99cc146421 100644 --- a/Qt_widget/include/CGAL/IO/Qt_widget_Polygon_2.h +++ b/Qt_widget/include/CGAL/IO/Qt_widget_Polygon_2.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/include/CGAL/IO/Qt_widget_Regular_triangulation_2.h b/Qt_widget/include/CGAL/IO/Qt_widget_Regular_triangulation_2.h index cd94aa71d9f..0713a224d5b 100644 --- a/Qt_widget/include/CGAL/IO/Qt_widget_Regular_triangulation_2.h +++ b/Qt_widget/include/CGAL/IO/Qt_widget_Regular_triangulation_2.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/include/CGAL/IO/Qt_widget_Triangulation_2.h b/Qt_widget/include/CGAL/IO/Qt_widget_Triangulation_2.h index 3ecc8f8c84e..3287e96993c 100644 --- a/Qt_widget/include/CGAL/IO/Qt_widget_Triangulation_2.h +++ b/Qt_widget/include/CGAL/IO/Qt_widget_Triangulation_2.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/include/CGAL/IO/Qt_widget_focus.h b/Qt_widget/include/CGAL/IO/Qt_widget_focus.h index 9a1b8580a6e..09311bb20c6 100644 --- a/Qt_widget/include/CGAL/IO/Qt_widget_focus.h +++ b/Qt_widget/include/CGAL/IO/Qt_widget_focus.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/include/CGAL/IO/Qt_widget_get_circle.h b/Qt_widget/include/CGAL/IO/Qt_widget_get_circle.h index 8c87d5f02de..212dded7e30 100644 --- a/Qt_widget/include/CGAL/IO/Qt_widget_get_circle.h +++ b/Qt_widget/include/CGAL/IO/Qt_widget_get_circle.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/include/CGAL/IO/Qt_widget_get_iso_rectangle.h b/Qt_widget/include/CGAL/IO/Qt_widget_get_iso_rectangle.h index 42328c5982d..79f24c6a829 100644 --- a/Qt_widget/include/CGAL/IO/Qt_widget_get_iso_rectangle.h +++ b/Qt_widget/include/CGAL/IO/Qt_widget_get_iso_rectangle.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/include/CGAL/IO/Qt_widget_get_line.h b/Qt_widget/include/CGAL/IO/Qt_widget_get_line.h index 65efbe1335f..d224cae5a1a 100644 --- a/Qt_widget/include/CGAL/IO/Qt_widget_get_line.h +++ b/Qt_widget/include/CGAL/IO/Qt_widget_get_line.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/include/CGAL/IO/Qt_widget_get_point.h b/Qt_widget/include/CGAL/IO/Qt_widget_get_point.h index 3dea144afa4..e87be9fc4b1 100644 --- a/Qt_widget/include/CGAL/IO/Qt_widget_get_point.h +++ b/Qt_widget/include/CGAL/IO/Qt_widget_get_point.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/include/CGAL/IO/Qt_widget_get_polygon.h b/Qt_widget/include/CGAL/IO/Qt_widget_get_polygon.h index 7900cbf918b..274b352a80c 100644 --- a/Qt_widget/include/CGAL/IO/Qt_widget_get_polygon.h +++ b/Qt_widget/include/CGAL/IO/Qt_widget_get_polygon.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/include/CGAL/IO/Qt_widget_get_segment.h b/Qt_widget/include/CGAL/IO/Qt_widget_get_segment.h index 91e3befcddc..8f730070249 100644 --- a/Qt_widget/include/CGAL/IO/Qt_widget_get_segment.h +++ b/Qt_widget/include/CGAL/IO/Qt_widget_get_segment.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/include/CGAL/IO/Qt_widget_get_simple_polygon.h b/Qt_widget/include/CGAL/IO/Qt_widget_get_simple_polygon.h index f3bd1fe7bad..2598cc41373 100644 --- a/Qt_widget/include/CGAL/IO/Qt_widget_get_simple_polygon.h +++ b/Qt_widget/include/CGAL/IO/Qt_widget_get_simple_polygon.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/include/CGAL/IO/Qt_widget_handtool.h b/Qt_widget/include/CGAL/IO/Qt_widget_handtool.h index 4baf2c08364..8d45648e55b 100644 --- a/Qt_widget/include/CGAL/IO/Qt_widget_handtool.h +++ b/Qt_widget/include/CGAL/IO/Qt_widget_handtool.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/include/CGAL/IO/Qt_widget_history.h b/Qt_widget/include/CGAL/IO/Qt_widget_history.h index cfabdec2440..d920597f5ef 100644 --- a/Qt_widget/include/CGAL/IO/Qt_widget_history.h +++ b/Qt_widget/include/CGAL/IO/Qt_widget_history.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/include/CGAL/IO/Qt_widget_layer.h b/Qt_widget/include/CGAL/IO/Qt_widget_layer.h index fde937aed88..9bf86aedde1 100644 --- a/Qt_widget/include/CGAL/IO/Qt_widget_layer.h +++ b/Qt_widget/include/CGAL/IO/Qt_widget_layer.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/include/CGAL/IO/Qt_widget_rotation_layer.h b/Qt_widget/include/CGAL/IO/Qt_widget_rotation_layer.h index 377a70037d9..1ce1ecd30e0 100644 --- a/Qt_widget/include/CGAL/IO/Qt_widget_rotation_layer.h +++ b/Qt_widget/include/CGAL/IO/Qt_widget_rotation_layer.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/include/CGAL/IO/Qt_widget_show_mouse_coordinates.h b/Qt_widget/include/CGAL/IO/Qt_widget_show_mouse_coordinates.h index a5e20e47ab7..2f2d3468164 100644 --- a/Qt_widget/include/CGAL/IO/Qt_widget_show_mouse_coordinates.h +++ b/Qt_widget/include/CGAL/IO/Qt_widget_show_mouse_coordinates.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/include/CGAL/IO/Qt_widget_standard_toolbar.h b/Qt_widget/include/CGAL/IO/Qt_widget_standard_toolbar.h index 5aa6d12c710..0746711586c 100644 --- a/Qt_widget/include/CGAL/IO/Qt_widget_standard_toolbar.h +++ b/Qt_widget/include/CGAL/IO/Qt_widget_standard_toolbar.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/include/CGAL/IO/Qt_widget_zoomrect.h b/Qt_widget/include/CGAL/IO/Qt_widget_zoomrect.h index 999626d6b3d..ba4a828203e 100644 --- a/Qt_widget/include/CGAL/IO/Qt_widget_zoomrect.h +++ b/Qt_widget/include/CGAL/IO/Qt_widget_zoomrect.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/include/CGAL/IO/pixmaps/alpha_shape.xpm b/Qt_widget/include/CGAL/IO/pixmaps/alpha_shape.xpm index 628da6b9cef..d9625c45bb5 100644 --- a/Qt_widget/include/CGAL/IO/pixmaps/alpha_shape.xpm +++ b/Qt_widget/include/CGAL/IO/pixmaps/alpha_shape.xpm @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/include/CGAL/IO/pixmaps/arrow.xpm b/Qt_widget/include/CGAL/IO/pixmaps/arrow.xpm index 81c7bb96f4c..24d09deab52 100644 --- a/Qt_widget/include/CGAL/IO/pixmaps/arrow.xpm +++ b/Qt_widget/include/CGAL/IO/pixmaps/arrow.xpm @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/include/CGAL/IO/pixmaps/back.xpm b/Qt_widget/include/CGAL/IO/pixmaps/back.xpm index 3bfe1e6f435..a678aeddcb0 100644 --- a/Qt_widget/include/CGAL/IO/pixmaps/back.xpm +++ b/Qt_widget/include/CGAL/IO/pixmaps/back.xpm @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/include/CGAL/IO/pixmaps/circle.xpm b/Qt_widget/include/CGAL/IO/pixmaps/circle.xpm index ddbc62b1caf..104f4bc09c1 100644 --- a/Qt_widget/include/CGAL/IO/pixmaps/circle.xpm +++ b/Qt_widget/include/CGAL/IO/pixmaps/circle.xpm @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/include/CGAL/IO/pixmaps/constrained.xpm b/Qt_widget/include/CGAL/IO/pixmaps/constrained.xpm index 4b97b5a25d4..a9759af3e25 100644 --- a/Qt_widget/include/CGAL/IO/pixmaps/constrained.xpm +++ b/Qt_widget/include/CGAL/IO/pixmaps/constrained.xpm @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/include/CGAL/IO/pixmaps/demoicon.xpm b/Qt_widget/include/CGAL/IO/pixmaps/demoicon.xpm index c434b04f84f..9e344d69b52 100644 --- a/Qt_widget/include/CGAL/IO/pixmaps/demoicon.xpm +++ b/Qt_widget/include/CGAL/IO/pixmaps/demoicon.xpm @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/include/CGAL/IO/pixmaps/focus.xpm b/Qt_widget/include/CGAL/IO/pixmaps/focus.xpm index 45fdb216183..9f63195bf8d 100644 --- a/Qt_widget/include/CGAL/IO/pixmaps/focus.xpm +++ b/Qt_widget/include/CGAL/IO/pixmaps/focus.xpm @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/include/CGAL/IO/pixmaps/focus1.xpm b/Qt_widget/include/CGAL/IO/pixmaps/focus1.xpm index 12e9ead7cf6..be53ba3dd75 100644 --- a/Qt_widget/include/CGAL/IO/pixmaps/focus1.xpm +++ b/Qt_widget/include/CGAL/IO/pixmaps/focus1.xpm @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/include/CGAL/IO/pixmaps/focus1_mask.xpm b/Qt_widget/include/CGAL/IO/pixmaps/focus1_mask.xpm index 6373a36012b..6593655ead0 100644 --- a/Qt_widget/include/CGAL/IO/pixmaps/focus1_mask.xpm +++ b/Qt_widget/include/CGAL/IO/pixmaps/focus1_mask.xpm @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/include/CGAL/IO/pixmaps/focus2.xpm b/Qt_widget/include/CGAL/IO/pixmaps/focus2.xpm index 2309f2cd5ed..bfb5cbb87ce 100644 --- a/Qt_widget/include/CGAL/IO/pixmaps/focus2.xpm +++ b/Qt_widget/include/CGAL/IO/pixmaps/focus2.xpm @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/include/CGAL/IO/pixmaps/focus2_mask.xpm b/Qt_widget/include/CGAL/IO/pixmaps/focus2_mask.xpm index a4773c626a1..be97ed25aa1 100644 --- a/Qt_widget/include/CGAL/IO/pixmaps/focus2_mask.xpm +++ b/Qt_widget/include/CGAL/IO/pixmaps/focus2_mask.xpm @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/include/CGAL/IO/pixmaps/focus3.xpm b/Qt_widget/include/CGAL/IO/pixmaps/focus3.xpm index 512923deae8..b39d2af2b3c 100644 --- a/Qt_widget/include/CGAL/IO/pixmaps/focus3.xpm +++ b/Qt_widget/include/CGAL/IO/pixmaps/focus3.xpm @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/include/CGAL/IO/pixmaps/focus3_mask.xpm b/Qt_widget/include/CGAL/IO/pixmaps/focus3_mask.xpm index ab5cea0aa08..e287951e5de 100644 --- a/Qt_widget/include/CGAL/IO/pixmaps/focus3_mask.xpm +++ b/Qt_widget/include/CGAL/IO/pixmaps/focus3_mask.xpm @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/include/CGAL/IO/pixmaps/forward.xpm b/Qt_widget/include/CGAL/IO/pixmaps/forward.xpm index be01f8a68e7..afda49f6184 100644 --- a/Qt_widget/include/CGAL/IO/pixmaps/forward.xpm +++ b/Qt_widget/include/CGAL/IO/pixmaps/forward.xpm @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/include/CGAL/IO/pixmaps/greene_approx.xpm b/Qt_widget/include/CGAL/IO/pixmaps/greene_approx.xpm index 9a190b6abbc..49afcf79499 100644 --- a/Qt_widget/include/CGAL/IO/pixmaps/greene_approx.xpm +++ b/Qt_widget/include/CGAL/IO/pixmaps/greene_approx.xpm @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/include/CGAL/IO/pixmaps/hand.xpm b/Qt_widget/include/CGAL/IO/pixmaps/hand.xpm index a73c648fd30..959482ac5eb 100644 --- a/Qt_widget/include/CGAL/IO/pixmaps/hand.xpm +++ b/Qt_widget/include/CGAL/IO/pixmaps/hand.xpm @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/include/CGAL/IO/pixmaps/handtool.xpm b/Qt_widget/include/CGAL/IO/pixmaps/handtool.xpm index ba9ef6ebc4f..6c74330e43c 100644 --- a/Qt_widget/include/CGAL/IO/pixmaps/handtool.xpm +++ b/Qt_widget/include/CGAL/IO/pixmaps/handtool.xpm @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/include/CGAL/IO/pixmaps/holddown.xpm b/Qt_widget/include/CGAL/IO/pixmaps/holddown.xpm index 00ea06fae34..20f96894b69 100644 --- a/Qt_widget/include/CGAL/IO/pixmaps/holddown.xpm +++ b/Qt_widget/include/CGAL/IO/pixmaps/holddown.xpm @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/include/CGAL/IO/pixmaps/iso_rectangle.xpm b/Qt_widget/include/CGAL/IO/pixmaps/iso_rectangle.xpm index 14cfc60bcb1..52d8cc4303f 100644 --- a/Qt_widget/include/CGAL/IO/pixmaps/iso_rectangle.xpm +++ b/Qt_widget/include/CGAL/IO/pixmaps/iso_rectangle.xpm @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/include/CGAL/IO/pixmaps/line.xpm b/Qt_widget/include/CGAL/IO/pixmaps/line.xpm index c0f905b5664..d1a97b84166 100644 --- a/Qt_widget/include/CGAL/IO/pixmaps/line.xpm +++ b/Qt_widget/include/CGAL/IO/pixmaps/line.xpm @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/include/CGAL/IO/pixmaps/min_parallelogram.xpm b/Qt_widget/include/CGAL/IO/pixmaps/min_parallelogram.xpm index bba80d9c901..e6a5d41158e 100644 --- a/Qt_widget/include/CGAL/IO/pixmaps/min_parallelogram.xpm +++ b/Qt_widget/include/CGAL/IO/pixmaps/min_parallelogram.xpm @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/include/CGAL/IO/pixmaps/min_rectangle.xpm b/Qt_widget/include/CGAL/IO/pixmaps/min_rectangle.xpm index 0b30b7fd52e..ed928fff55e 100644 --- a/Qt_widget/include/CGAL/IO/pixmaps/min_rectangle.xpm +++ b/Qt_widget/include/CGAL/IO/pixmaps/min_rectangle.xpm @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/include/CGAL/IO/pixmaps/mouse_coord.xpm b/Qt_widget/include/CGAL/IO/pixmaps/mouse_coord.xpm index ed6d134458e..0905cd85fad 100644 --- a/Qt_widget/include/CGAL/IO/pixmaps/mouse_coord.xpm +++ b/Qt_widget/include/CGAL/IO/pixmaps/mouse_coord.xpm @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/include/CGAL/IO/pixmaps/movepoint.xpm b/Qt_widget/include/CGAL/IO/pixmaps/movepoint.xpm index b080184553a..ffb3c527640 100644 --- a/Qt_widget/include/CGAL/IO/pixmaps/movepoint.xpm +++ b/Qt_widget/include/CGAL/IO/pixmaps/movepoint.xpm @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/include/CGAL/IO/pixmaps/nearest_vertex.xpm b/Qt_widget/include/CGAL/IO/pixmaps/nearest_vertex.xpm index abc8d7219c4..f2777ce43a0 100644 --- a/Qt_widget/include/CGAL/IO/pixmaps/nearest_vertex.xpm +++ b/Qt_widget/include/CGAL/IO/pixmaps/nearest_vertex.xpm @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/include/CGAL/IO/pixmaps/notool.xpm b/Qt_widget/include/CGAL/IO/pixmaps/notool.xpm index b08ac709f3b..539538a0f23 100644 --- a/Qt_widget/include/CGAL/IO/pixmaps/notool.xpm +++ b/Qt_widget/include/CGAL/IO/pixmaps/notool.xpm @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/include/CGAL/IO/pixmaps/optimal_convex.xpm b/Qt_widget/include/CGAL/IO/pixmaps/optimal_convex.xpm index 59dec1dbb46..1f8d15c691a 100644 --- a/Qt_widget/include/CGAL/IO/pixmaps/optimal_convex.xpm +++ b/Qt_widget/include/CGAL/IO/pixmaps/optimal_convex.xpm @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/include/CGAL/IO/pixmaps/point.xpm b/Qt_widget/include/CGAL/IO/pixmaps/point.xpm index 5efc2264703..13b8335cbfb 100644 --- a/Qt_widget/include/CGAL/IO/pixmaps/point.xpm +++ b/Qt_widget/include/CGAL/IO/pixmaps/point.xpm @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/include/CGAL/IO/pixmaps/points.xpm b/Qt_widget/include/CGAL/IO/pixmaps/points.xpm index e67700a6a7b..a3d8915b1f2 100644 --- a/Qt_widget/include/CGAL/IO/pixmaps/points.xpm +++ b/Qt_widget/include/CGAL/IO/pixmaps/points.xpm @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/include/CGAL/IO/pixmaps/polygon.xpm b/Qt_widget/include/CGAL/IO/pixmaps/polygon.xpm index bbe06d94786..4d552746392 100644 --- a/Qt_widget/include/CGAL/IO/pixmaps/polygon.xpm +++ b/Qt_widget/include/CGAL/IO/pixmaps/polygon.xpm @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/include/CGAL/IO/pixmaps/rotation.xpm b/Qt_widget/include/CGAL/IO/pixmaps/rotation.xpm index f9c437ab3c9..1141d055f5f 100644 --- a/Qt_widget/include/CGAL/IO/pixmaps/rotation.xpm +++ b/Qt_widget/include/CGAL/IO/pixmaps/rotation.xpm @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/include/CGAL/IO/pixmaps/show_polygon.xpm b/Qt_widget/include/CGAL/IO/pixmaps/show_polygon.xpm index dd85a2044f8..5d49a5aa272 100644 --- a/Qt_widget/include/CGAL/IO/pixmaps/show_polygon.xpm +++ b/Qt_widget/include/CGAL/IO/pixmaps/show_polygon.xpm @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/include/CGAL/IO/pixmaps/triangulation.xpm b/Qt_widget/include/CGAL/IO/pixmaps/triangulation.xpm index 47196f3a248..e4f41815382 100644 --- a/Qt_widget/include/CGAL/IO/pixmaps/triangulation.xpm +++ b/Qt_widget/include/CGAL/IO/pixmaps/triangulation.xpm @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/include/CGAL/IO/pixmaps/voronoi.xpm b/Qt_widget/include/CGAL/IO/pixmaps/voronoi.xpm index 66af64f3181..e24d3c7e2c1 100644 --- a/Qt_widget/include/CGAL/IO/pixmaps/voronoi.xpm +++ b/Qt_widget/include/CGAL/IO/pixmaps/voronoi.xpm @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/include/CGAL/IO/pixmaps/ymonotone.xpm b/Qt_widget/include/CGAL/IO/pixmaps/ymonotone.xpm index e3bf09901a5..ca700c6db07 100644 --- a/Qt_widget/include/CGAL/IO/pixmaps/ymonotone.xpm +++ b/Qt_widget/include/CGAL/IO/pixmaps/ymonotone.xpm @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/include/CGAL/IO/pixmaps/zoom_in.xpm b/Qt_widget/include/CGAL/IO/pixmaps/zoom_in.xpm index 75992bbacd2..6f9cf266626 100644 --- a/Qt_widget/include/CGAL/IO/pixmaps/zoom_in.xpm +++ b/Qt_widget/include/CGAL/IO/pixmaps/zoom_in.xpm @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/include/CGAL/IO/pixmaps/zoom_in_rect.xpm b/Qt_widget/include/CGAL/IO/pixmaps/zoom_in_rect.xpm index 19642951664..4655afdd74f 100644 --- a/Qt_widget/include/CGAL/IO/pixmaps/zoom_in_rect.xpm +++ b/Qt_widget/include/CGAL/IO/pixmaps/zoom_in_rect.xpm @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/include/CGAL/IO/pixmaps/zoom_out.xpm b/Qt_widget/include/CGAL/IO/pixmaps/zoom_out.xpm index f470f6137d2..0fee8a5df00 100644 --- a/Qt_widget/include/CGAL/IO/pixmaps/zoom_out.xpm +++ b/Qt_widget/include/CGAL/IO/pixmaps/zoom_out.xpm @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/src/CGALQt3/Qt_help_window.cpp b/Qt_widget/src/CGALQt3/Qt_help_window.cpp index 97bb946b82a..cc01b41267e 100644 --- a/Qt_widget/src/CGALQt3/Qt_help_window.cpp +++ b/Qt_widget/src/CGALQt3/Qt_help_window.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/src/CGALQt3/Qt_widget.cpp b/Qt_widget/src/CGALQt3/Qt_widget.cpp index be9750bddde..93ebc2da5e7 100644 --- a/Qt_widget/src/CGALQt3/Qt_widget.cpp +++ b/Qt_widget/src/CGALQt3/Qt_widget.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/src/CGALQt3/Qt_widget_history.cpp b/Qt_widget/src/CGALQt3/Qt_widget_history.cpp index e2dc1f771e2..471c8e891fb 100644 --- a/Qt_widget/src/CGALQt3/Qt_widget_history.cpp +++ b/Qt_widget/src/CGALQt3/Qt_widget_history.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/src/CGALQt3/Qt_widget_layer.cpp b/Qt_widget/src/CGALQt3/Qt_widget_layer.cpp index 35d068869ee..d2e718f8a56 100644 --- a/Qt_widget/src/CGALQt3/Qt_widget_layer.cpp +++ b/Qt_widget/src/CGALQt3/Qt_widget_layer.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/src/CGALQt3/Qt_widget_standard_toolbar.cpp b/Qt_widget/src/CGALQt3/Qt_widget_standard_toolbar.cpp index b2b29e13eec..218f636c806 100644 --- a/Qt_widget/src/CGALQt3/Qt_widget_standard_toolbar.cpp +++ b/Qt_widget/src/CGALQt3/Qt_widget_standard_toolbar.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Qt_widget/src/CGALQt3/Qt_widget_xpm_icons.cpp b/Qt_widget/src/CGALQt3/Qt_widget_xpm_icons.cpp index 3032095b74e..a7344996017 100644 --- a/Qt_widget/src/CGALQt3/Qt_widget_xpm_icons.cpp +++ b/Qt_widget/src/CGALQt3/Qt_widget_xpm_icons.cpp @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Random_numbers/include/CGAL/Random.h b/Random_numbers/include/CGAL/Random.h index 71b731dcfa8..b6ea695da1f 100644 --- a/Random_numbers/include/CGAL/Random.h +++ b/Random_numbers/include/CGAL/Random.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Random_numbers/src/CGAL/Random.cpp b/Random_numbers/src/CGAL/Random.cpp index ceeb5b897f3..9b7be185cdb 100644 --- a/Random_numbers/src/CGAL/Random.cpp +++ b/Random_numbers/src/CGAL/Random.cpp @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Robustness/demo/Robustness/cgal_types.h b/Robustness/demo/Robustness/cgal_types.h index 2e153b0d8d1..963de88aeb0 100644 --- a/Robustness/demo/Robustness/cgal_types.h +++ b/Robustness/demo/Robustness/cgal_types.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Robustness/demo/Robustness/robustness.cpp b/Robustness/demo/Robustness/robustness.cpp index d9927a42317..3ed783e2a17 100644 --- a/Robustness/demo/Robustness/robustness.cpp +++ b/Robustness/demo/Robustness/robustness.cpp @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/STL_Extension/include/CGAL/Cache.h b/STL_Extension/include/CGAL/Cache.h index f7c7cd16aeb..49f09d03005 100644 --- a/STL_Extension/include/CGAL/Cache.h +++ b/STL_Extension/include/CGAL/Cache.h @@ -5,8 +5,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/STL_Extension/include/CGAL/Circulator_identity.h b/STL_Extension/include/CGAL/Circulator_identity.h index b6877f00206..a9a044869c6 100644 --- a/STL_Extension/include/CGAL/Circulator_identity.h +++ b/STL_Extension/include/CGAL/Circulator_identity.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/STL_Extension/include/CGAL/Circulator_on_node.h b/STL_Extension/include/CGAL/Circulator_on_node.h index 9c62b61d0ad..f7558246157 100644 --- a/STL_Extension/include/CGAL/Circulator_on_node.h +++ b/STL_Extension/include/CGAL/Circulator_on_node.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/STL_Extension/include/CGAL/Circulator_project.h b/STL_Extension/include/CGAL/Circulator_project.h index b00498cebe7..4fc56f7a5fe 100644 --- a/STL_Extension/include/CGAL/Circulator_project.h +++ b/STL_Extension/include/CGAL/Circulator_project.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/STL_Extension/include/CGAL/Compact_container.h b/STL_Extension/include/CGAL/Compact_container.h index a5a0ea2fbeb..53f76f393d3 100644 --- a/STL_Extension/include/CGAL/Compact_container.h +++ b/STL_Extension/include/CGAL/Compact_container.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/STL_Extension/include/CGAL/Complexity_tags.h b/STL_Extension/include/CGAL/Complexity_tags.h index c6428701dd5..82bf5a57961 100644 --- a/STL_Extension/include/CGAL/Complexity_tags.h +++ b/STL_Extension/include/CGAL/Complexity_tags.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/STL_Extension/include/CGAL/Concatenate_iterator.h b/STL_Extension/include/CGAL/Concatenate_iterator.h index 4747d42e213..be75efa7ff6 100644 --- a/STL_Extension/include/CGAL/Concatenate_iterator.h +++ b/STL_Extension/include/CGAL/Concatenate_iterator.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/STL_Extension/include/CGAL/Counting_iterator.h b/STL_Extension/include/CGAL/Counting_iterator.h index bf9b2f1f595..dc788ab32ed 100644 --- a/STL_Extension/include/CGAL/Counting_iterator.h +++ b/STL_Extension/include/CGAL/Counting_iterator.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/STL_Extension/include/CGAL/Default.h b/STL_Extension/include/CGAL/Default.h index 1c45e8abcf7..948886ce663 100644 --- a/STL_Extension/include/CGAL/Default.h +++ b/STL_Extension/include/CGAL/Default.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/STL_Extension/include/CGAL/Flattening_iterator.h b/STL_Extension/include/CGAL/Flattening_iterator.h index 4528ca05c98..90864af3d32 100644 --- a/STL_Extension/include/CGAL/Flattening_iterator.h +++ b/STL_Extension/include/CGAL/Flattening_iterator.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/STL_Extension/include/CGAL/Fourtuple.h b/STL_Extension/include/CGAL/Fourtuple.h index b3ec909d311..f96e8cb35f6 100644 --- a/STL_Extension/include/CGAL/Fourtuple.h +++ b/STL_Extension/include/CGAL/Fourtuple.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/STL_Extension/include/CGAL/Handle.h b/STL_Extension/include/CGAL/Handle.h index 83a44bf0f03..41aafba0898 100644 --- a/STL_Extension/include/CGAL/Handle.h +++ b/STL_Extension/include/CGAL/Handle.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/STL_Extension/include/CGAL/Handle_for.h b/STL_Extension/include/CGAL/Handle_for.h index 9a0c818e278..547b11346f0 100644 --- a/STL_Extension/include/CGAL/Handle_for.h +++ b/STL_Extension/include/CGAL/Handle_for.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/STL_Extension/include/CGAL/Handle_for_virtual.h b/STL_Extension/include/CGAL/Handle_for_virtual.h index 60f11bc8481..1edc47ddd8d 100644 --- a/STL_Extension/include/CGAL/Handle_for_virtual.h +++ b/STL_Extension/include/CGAL/Handle_for_virtual.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/STL_Extension/include/CGAL/Handle_with_policy.h b/STL_Extension/include/CGAL/Handle_with_policy.h index 64492a07654..0fff127e5e0 100644 --- a/STL_Extension/include/CGAL/Handle_with_policy.h +++ b/STL_Extension/include/CGAL/Handle_with_policy.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/STL_Extension/include/CGAL/In_place_list.h b/STL_Extension/include/CGAL/In_place_list.h index bf7748f47bd..53d6574f39b 100644 --- a/STL_Extension/include/CGAL/In_place_list.h +++ b/STL_Extension/include/CGAL/In_place_list.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/STL_Extension/include/CGAL/Inverse_index.h b/STL_Extension/include/CGAL/Inverse_index.h index bf9b2f1f595..dc788ab32ed 100644 --- a/STL_Extension/include/CGAL/Inverse_index.h +++ b/STL_Extension/include/CGAL/Inverse_index.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/STL_Extension/include/CGAL/Iterator_identity.h b/STL_Extension/include/CGAL/Iterator_identity.h index 2b230091766..d61ba45fb65 100644 --- a/STL_Extension/include/CGAL/Iterator_identity.h +++ b/STL_Extension/include/CGAL/Iterator_identity.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/STL_Extension/include/CGAL/Iterator_project.h b/STL_Extension/include/CGAL/Iterator_project.h index c036fce02cb..1c971a67bf7 100644 --- a/STL_Extension/include/CGAL/Iterator_project.h +++ b/STL_Extension/include/CGAL/Iterator_project.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/STL_Extension/include/CGAL/Iterator_transform.h b/STL_Extension/include/CGAL/Iterator_transform.h index b49f0737b2e..0485cb29b32 100644 --- a/STL_Extension/include/CGAL/Iterator_transform.h +++ b/STL_Extension/include/CGAL/Iterator_transform.h @@ -8,8 +8,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/STL_Extension/include/CGAL/Join_input_iterator.h b/STL_Extension/include/CGAL/Join_input_iterator.h index bf9b2f1f595..dc788ab32ed 100644 --- a/STL_Extension/include/CGAL/Join_input_iterator.h +++ b/STL_Extension/include/CGAL/Join_input_iterator.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/STL_Extension/include/CGAL/Location_policy.h b/STL_Extension/include/CGAL/Location_policy.h index c3abe3eaaaf..769dbd955f6 100644 --- a/STL_Extension/include/CGAL/Location_policy.h +++ b/STL_Extension/include/CGAL/Location_policy.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/STL_Extension/include/CGAL/Modifiable_priority_queue.h b/STL_Extension/include/CGAL/Modifiable_priority_queue.h index 96726619c1b..1671468eff4 100644 --- a/STL_Extension/include/CGAL/Modifiable_priority_queue.h +++ b/STL_Extension/include/CGAL/Modifiable_priority_queue.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/STL_Extension/include/CGAL/Multiset.h b/STL_Extension/include/CGAL/Multiset.h index 8bb4d8add83..95eaca9a0e2 100644 --- a/STL_Extension/include/CGAL/Multiset.h +++ b/STL_Extension/include/CGAL/Multiset.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/STL_Extension/include/CGAL/N_step_adaptor.h b/STL_Extension/include/CGAL/N_step_adaptor.h index bf9b2f1f595..dc788ab32ed 100644 --- a/STL_Extension/include/CGAL/N_step_adaptor.h +++ b/STL_Extension/include/CGAL/N_step_adaptor.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/STL_Extension/include/CGAL/N_step_adaptor_derived.h b/STL_Extension/include/CGAL/N_step_adaptor_derived.h index bf9b2f1f595..dc788ab32ed 100644 --- a/STL_Extension/include/CGAL/N_step_adaptor_derived.h +++ b/STL_Extension/include/CGAL/N_step_adaptor_derived.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/STL_Extension/include/CGAL/Nested_iterator.h b/STL_Extension/include/CGAL/Nested_iterator.h index 07c1b33c428..6288c22dadf 100644 --- a/STL_Extension/include/CGAL/Nested_iterator.h +++ b/STL_Extension/include/CGAL/Nested_iterator.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/STL_Extension/include/CGAL/Object.h b/STL_Extension/include/CGAL/Object.h index 9109481e9bd..4c871a3f8c2 100644 --- a/STL_Extension/include/CGAL/Object.h +++ b/STL_Extension/include/CGAL/Object.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/STL_Extension/include/CGAL/Random_access_adaptor.h b/STL_Extension/include/CGAL/Random_access_adaptor.h index bf9b2f1f595..dc788ab32ed 100644 --- a/STL_Extension/include/CGAL/Random_access_adaptor.h +++ b/STL_Extension/include/CGAL/Random_access_adaptor.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/STL_Extension/include/CGAL/Random_access_value_adaptor.h b/STL_Extension/include/CGAL/Random_access_value_adaptor.h index 988b76d2d02..c3eba28c2d9 100644 --- a/STL_Extension/include/CGAL/Random_access_value_adaptor.h +++ b/STL_Extension/include/CGAL/Random_access_value_adaptor.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/STL_Extension/include/CGAL/Sixtuple.h b/STL_Extension/include/CGAL/Sixtuple.h index 39137513ec1..a6fa181027c 100644 --- a/STL_Extension/include/CGAL/Sixtuple.h +++ b/STL_Extension/include/CGAL/Sixtuple.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/STL_Extension/include/CGAL/Threetuple.h b/STL_Extension/include/CGAL/Threetuple.h index 44a02881f8b..a36e7fa6e6b 100644 --- a/STL_Extension/include/CGAL/Threetuple.h +++ b/STL_Extension/include/CGAL/Threetuple.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/STL_Extension/include/CGAL/Twotuple.h b/STL_Extension/include/CGAL/Twotuple.h index 96d61576585..af5d834f753 100644 --- a/STL_Extension/include/CGAL/Twotuple.h +++ b/STL_Extension/include/CGAL/Twotuple.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/STL_Extension/include/CGAL/Uncertain.h b/STL_Extension/include/CGAL/Uncertain.h index adadc213ace..e7d90e0ac8e 100644 --- a/STL_Extension/include/CGAL/Uncertain.h +++ b/STL_Extension/include/CGAL/Uncertain.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/STL_Extension/include/CGAL/algorithm.h b/STL_Extension/include/CGAL/algorithm.h index ba4bedf37af..3432683bec0 100644 --- a/STL_Extension/include/CGAL/algorithm.h +++ b/STL_Extension/include/CGAL/algorithm.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/STL_Extension/include/CGAL/array.h b/STL_Extension/include/CGAL/array.h index 15103ef2459..7644d77c185 100644 --- a/STL_Extension/include/CGAL/array.h +++ b/STL_Extension/include/CGAL/array.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/STL_Extension/include/CGAL/assertions.h b/STL_Extension/include/CGAL/assertions.h index 49ec2c47c2c..437b4c8fd80 100644 --- a/STL_Extension/include/CGAL/assertions.h +++ b/STL_Extension/include/CGAL/assertions.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/STL_Extension/include/CGAL/assertions_behaviour.h b/STL_Extension/include/CGAL/assertions_behaviour.h index 03593a7a15f..fc042d4c439 100644 --- a/STL_Extension/include/CGAL/assertions_behaviour.h +++ b/STL_Extension/include/CGAL/assertions_behaviour.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/STL_Extension/include/CGAL/copy_n.h b/STL_Extension/include/CGAL/copy_n.h index aa71d820381..7961824e195 100644 --- a/STL_Extension/include/CGAL/copy_n.h +++ b/STL_Extension/include/CGAL/copy_n.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/STL_Extension/include/CGAL/exceptions.h b/STL_Extension/include/CGAL/exceptions.h index 5c77a344782..416abd7a06f 100644 --- a/STL_Extension/include/CGAL/exceptions.h +++ b/STL_Extension/include/CGAL/exceptions.h @@ -4,8 +4,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/STL_Extension/include/CGAL/function_objects.h b/STL_Extension/include/CGAL/function_objects.h index 7a98835f123..3cabe354c14 100644 --- a/STL_Extension/include/CGAL/function_objects.h +++ b/STL_Extension/include/CGAL/function_objects.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/STL_Extension/include/CGAL/internal/boost/property_map.h b/STL_Extension/include/CGAL/internal/boost/property_map.h index a5ca546c94b..296f03c27b7 100644 --- a/STL_Extension/include/CGAL/internal/boost/property_map.h +++ b/STL_Extension/include/CGAL/internal/boost/property_map.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/STL_Extension/include/CGAL/is_convertible.h b/STL_Extension/include/CGAL/is_convertible.h index a7bab6e9368..7f958b92198 100644 --- a/STL_Extension/include/CGAL/is_convertible.h +++ b/STL_Extension/include/CGAL/is_convertible.h @@ -6,8 +6,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/STL_Extension/include/CGAL/is_iterator.h b/STL_Extension/include/CGAL/is_iterator.h index f7da841103c..b2b353f4ba7 100644 --- a/STL_Extension/include/CGAL/is_iterator.h +++ b/STL_Extension/include/CGAL/is_iterator.h @@ -6,8 +6,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/STL_Extension/include/CGAL/iterator.h b/STL_Extension/include/CGAL/iterator.h index 549b9d46917..33636da9d3a 100644 --- a/STL_Extension/include/CGAL/iterator.h +++ b/STL_Extension/include/CGAL/iterator.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/STL_Extension/include/CGAL/memory.h b/STL_Extension/include/CGAL/memory.h index 17537cf3b9e..38db5677676 100644 --- a/STL_Extension/include/CGAL/memory.h +++ b/STL_Extension/include/CGAL/memory.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/STL_Extension/include/CGAL/min_max_n.h b/STL_Extension/include/CGAL/min_max_n.h index 0820b2e14f4..cd21566b8cb 100644 --- a/STL_Extension/include/CGAL/min_max_n.h +++ b/STL_Extension/include/CGAL/min_max_n.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/STL_Extension/include/CGAL/multiset_assertions.h b/STL_Extension/include/CGAL/multiset_assertions.h index 4d37d704e3c..767925a9332 100644 --- a/STL_Extension/include/CGAL/multiset_assertions.h +++ b/STL_Extension/include/CGAL/multiset_assertions.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/STL_Extension/include/CGAL/tags.h b/STL_Extension/include/CGAL/tags.h index 3a57038fb71..423fd26ae4b 100644 --- a/STL_Extension/include/CGAL/tags.h +++ b/STL_Extension/include/CGAL/tags.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/STL_Extension/include/CGAL/tuple.h b/STL_Extension/include/CGAL/tuple.h index f8cd14b608a..7caa2c05098 100644 --- a/STL_Extension/include/CGAL/tuple.h +++ b/STL_Extension/include/CGAL/tuple.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/STL_Extension/include/CGAL/type_traits.h b/STL_Extension/include/CGAL/type_traits.h index fe3ba2afea7..017e2334fbd 100644 --- a/STL_Extension/include/CGAL/type_traits.h +++ b/STL_Extension/include/CGAL/type_traits.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/STL_Extension/include/CGAL/utility.h b/STL_Extension/include/CGAL/utility.h index c7b6c69af83..85ca9533908 100644 --- a/STL_Extension/include/CGAL/utility.h +++ b/STL_Extension/include/CGAL/utility.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/STL_Extension/include/CGAL/vector.h b/STL_Extension/include/CGAL/vector.h index 5091da78a9e..0329fa54046 100644 --- a/STL_Extension/include/CGAL/vector.h +++ b/STL_Extension/include/CGAL/vector.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/STL_Extension/src/CGAL/assertions.cpp b/STL_Extension/src/CGAL/assertions.cpp index d832a60af5c..68e12be380c 100644 --- a/STL_Extension/src/CGAL/assertions.cpp +++ b/STL_Extension/src/CGAL/assertions.cpp @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Scripts/developer_scripts/check_licenses b/Scripts/developer_scripts/check_licenses index 80347820d98..af16e0c811f 100755 --- a/Scripts/developer_scripts/check_licenses +++ b/Scripts/developer_scripts/check_licenses @@ -8,8 +8,8 @@ # # This file is part of CGAL (www.cgal.org); you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation; version 2.1 of the License. -# See the file LICENSE.LGPL distributed with CGAL. +# published by the Free Software Foundation; either version 3 of the License, +# or (at your option) any later version. # # Licensees holding a valid commercial license may use this file in # accordance with the commercial license agreement provided with the software. diff --git a/Scripts/developer_scripts/create_internal_release b/Scripts/developer_scripts/create_internal_release index 8dda9e5b76a..cf987a81f64 100755 --- a/Scripts/developer_scripts/create_internal_release +++ b/Scripts/developer_scripts/create_internal_release @@ -249,8 +249,8 @@ sub create_version_file() // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Scripts/developer_scripts/list_cgal_includes b/Scripts/developer_scripts/list_cgal_includes index 6e045007e58..b126e0b408c 100755 --- a/Scripts/developer_scripts/list_cgal_includes +++ b/Scripts/developer_scripts/list_cgal_includes @@ -8,8 +8,8 @@ # # This file is part of CGAL (www.cgal.org); you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation; version 2.1 of the License. -# See the file LICENSE.LGPL distributed with CGAL. +# published by the Free Software Foundation; version 3 of the License, +# or (at your option) any later version. # # Licensees holding a valid commercial license may use this file in # accordance with the commercial license agreement provided with the software. diff --git a/Scripts/scripts/cgal_create_assertions.sh b/Scripts/scripts/cgal_create_assertions.sh index ac9c70e1819..1675cc52770 100755 --- a/Scripts/scripts/cgal_create_assertions.sh +++ b/Scripts/scripts/cgal_create_assertions.sh @@ -7,8 +7,8 @@ # # This file is part of CGAL (www.cgal.org); you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation; version 2.1 of the License. -# See the file LICENSE.LGPL distributed with CGAL. +# published by the Free Software Foundation; version 3 of the License, +# or (at your option) any later version. # # Licensees holding a valid commercial license may use this file in # accordance with the commercial license agreement provided with the software. diff --git a/Scripts/scripts/cgal_create_cmake_script b/Scripts/scripts/cgal_create_cmake_script index 7251f0cbf26..77bd642e3d5 100755 --- a/Scripts/scripts/cgal_create_cmake_script +++ b/Scripts/scripts/cgal_create_cmake_script @@ -9,8 +9,8 @@ # # This file is part of CGAL (www.cgal.org); you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation; version 2.1 of the License. -# See the file LICENSE.LGPL distributed with CGAL. +# published by the Free Software Foundation; version 3 of the License, +# or (at your option) any later version. # # Licensees holding a valid commercial license may use this file in # accordance with the commercial license agreement provided with the software. diff --git a/Scripts/scripts/cgal_create_cmake_script_with_options b/Scripts/scripts/cgal_create_cmake_script_with_options index 877557e38cd..539e428d64a 100755 --- a/Scripts/scripts/cgal_create_cmake_script_with_options +++ b/Scripts/scripts/cgal_create_cmake_script_with_options @@ -9,8 +9,8 @@ # # This file is part of CGAL (www.cgal.org); you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation; version 2.1 of the License. -# See the file LICENSE.LGPL distributed with CGAL. +# published by the Free Software Foundation; either version 3 of the License, +# or (at your option) any later version. # # Licensees holding a valid commercial license may use this file in # accordance with the commercial license agreement provided with the software. diff --git a/Spatial_sorting/include/CGAL/Hilbert_policy_tags.h b/Spatial_sorting/include/CGAL/Hilbert_policy_tags.h index 3297a507966..e5e19964af2 100644 --- a/Spatial_sorting/include/CGAL/Hilbert_policy_tags.h +++ b/Spatial_sorting/include/CGAL/Hilbert_policy_tags.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Spatial_sorting/include/CGAL/Hilbert_sort_2.h b/Spatial_sorting/include/CGAL/Hilbert_sort_2.h index 021b105c7fd..353b81729b6 100644 --- a/Spatial_sorting/include/CGAL/Hilbert_sort_2.h +++ b/Spatial_sorting/include/CGAL/Hilbert_sort_2.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Spatial_sorting/include/CGAL/Hilbert_sort_3.h b/Spatial_sorting/include/CGAL/Hilbert_sort_3.h index 76f100f1931..959468e683d 100644 --- a/Spatial_sorting/include/CGAL/Hilbert_sort_3.h +++ b/Spatial_sorting/include/CGAL/Hilbert_sort_3.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Spatial_sorting/include/CGAL/Hilbert_sort_base.h b/Spatial_sorting/include/CGAL/Hilbert_sort_base.h index 462e989730f..561b6fe7f83 100644 --- a/Spatial_sorting/include/CGAL/Hilbert_sort_base.h +++ b/Spatial_sorting/include/CGAL/Hilbert_sort_base.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Spatial_sorting/include/CGAL/Hilbert_sort_d.h b/Spatial_sorting/include/CGAL/Hilbert_sort_d.h index aacfcdf8cf1..a8d58cd02f3 100644 --- a/Spatial_sorting/include/CGAL/Hilbert_sort_d.h +++ b/Spatial_sorting/include/CGAL/Hilbert_sort_d.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Spatial_sorting/include/CGAL/Hilbert_sort_median_2.h b/Spatial_sorting/include/CGAL/Hilbert_sort_median_2.h index 832a54f19e6..84a93202619 100644 --- a/Spatial_sorting/include/CGAL/Hilbert_sort_median_2.h +++ b/Spatial_sorting/include/CGAL/Hilbert_sort_median_2.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Spatial_sorting/include/CGAL/Hilbert_sort_median_3.h b/Spatial_sorting/include/CGAL/Hilbert_sort_median_3.h index 33b64a20eb8..10042b6b5ff 100644 --- a/Spatial_sorting/include/CGAL/Hilbert_sort_median_3.h +++ b/Spatial_sorting/include/CGAL/Hilbert_sort_median_3.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Spatial_sorting/include/CGAL/Hilbert_sort_median_d.h b/Spatial_sorting/include/CGAL/Hilbert_sort_median_d.h index ea597cc5049..d2cf0a3feb5 100644 --- a/Spatial_sorting/include/CGAL/Hilbert_sort_median_d.h +++ b/Spatial_sorting/include/CGAL/Hilbert_sort_median_d.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Spatial_sorting/include/CGAL/Hilbert_sort_middle_2.h b/Spatial_sorting/include/CGAL/Hilbert_sort_middle_2.h index 303b224432d..dd442020b7d 100644 --- a/Spatial_sorting/include/CGAL/Hilbert_sort_middle_2.h +++ b/Spatial_sorting/include/CGAL/Hilbert_sort_middle_2.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Spatial_sorting/include/CGAL/Hilbert_sort_middle_3.h b/Spatial_sorting/include/CGAL/Hilbert_sort_middle_3.h index 5b5d6d2fd63..01a5747b7f7 100644 --- a/Spatial_sorting/include/CGAL/Hilbert_sort_middle_3.h +++ b/Spatial_sorting/include/CGAL/Hilbert_sort_middle_3.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Spatial_sorting/include/CGAL/Hilbert_sort_middle_base.h b/Spatial_sorting/include/CGAL/Hilbert_sort_middle_base.h index fcda1b94b37..ebb7ca49630 100644 --- a/Spatial_sorting/include/CGAL/Hilbert_sort_middle_base.h +++ b/Spatial_sorting/include/CGAL/Hilbert_sort_middle_base.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Spatial_sorting/include/CGAL/Hilbert_sort_middle_d.h b/Spatial_sorting/include/CGAL/Hilbert_sort_middle_d.h index 3672414c841..4cd7b61e074 100644 --- a/Spatial_sorting/include/CGAL/Hilbert_sort_middle_d.h +++ b/Spatial_sorting/include/CGAL/Hilbert_sort_middle_d.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Spatial_sorting/include/CGAL/Multiscale_sort.h b/Spatial_sorting/include/CGAL/Multiscale_sort.h index 51c5df33b5d..bfc67420d6f 100644 --- a/Spatial_sorting/include/CGAL/Multiscale_sort.h +++ b/Spatial_sorting/include/CGAL/Multiscale_sort.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Spatial_sorting/include/CGAL/Spatial_sort_traits_adapter_2.h b/Spatial_sorting/include/CGAL/Spatial_sort_traits_adapter_2.h index 1bc0d0d642a..e84097e8468 100644 --- a/Spatial_sorting/include/CGAL/Spatial_sort_traits_adapter_2.h +++ b/Spatial_sorting/include/CGAL/Spatial_sort_traits_adapter_2.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Spatial_sorting/include/CGAL/Spatial_sort_traits_adapter_3.h b/Spatial_sorting/include/CGAL/Spatial_sort_traits_adapter_3.h index 2a3f07d0af5..107bc4d1f37 100644 --- a/Spatial_sorting/include/CGAL/Spatial_sort_traits_adapter_3.h +++ b/Spatial_sorting/include/CGAL/Spatial_sort_traits_adapter_3.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Spatial_sorting/include/CGAL/Spatial_sort_traits_adapter_d.h b/Spatial_sorting/include/CGAL/Spatial_sort_traits_adapter_d.h index 3c0c11934d0..ad2ef1c68f6 100644 --- a/Spatial_sorting/include/CGAL/Spatial_sort_traits_adapter_d.h +++ b/Spatial_sorting/include/CGAL/Spatial_sort_traits_adapter_d.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Spatial_sorting/include/CGAL/hilbert_sort.h b/Spatial_sorting/include/CGAL/hilbert_sort.h index 0f28b74dca2..f762f288a02 100644 --- a/Spatial_sorting/include/CGAL/hilbert_sort.h +++ b/Spatial_sorting/include/CGAL/hilbert_sort.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Spatial_sorting/include/CGAL/spatial_sort.h b/Spatial_sorting/include/CGAL/spatial_sort.h index 6374f546ea7..cbd8f08638b 100644 --- a/Spatial_sorting/include/CGAL/spatial_sort.h +++ b/Spatial_sorting/include/CGAL/spatial_sort.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Straight_skeleton_2/include/CGAL/IO/Dxf_stream.h b/Straight_skeleton_2/include/CGAL/IO/Dxf_stream.h index 85ec796b74f..205c61d8df6 100644 --- a/Straight_skeleton_2/include/CGAL/IO/Dxf_stream.h +++ b/Straight_skeleton_2/include/CGAL/IO/Dxf_stream.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Straight_skeleton_2/include/CGAL/IO/Dxf_writer.h b/Straight_skeleton_2/include/CGAL/IO/Dxf_writer.h index 86c5f6d489e..bd790d9add5 100644 --- a/Straight_skeleton_2/include/CGAL/IO/Dxf_writer.h +++ b/Straight_skeleton_2/include/CGAL/IO/Dxf_writer.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Straight_skeleton_2/include/CGAL/certified_numeric_predicates.h b/Straight_skeleton_2/include/CGAL/certified_numeric_predicates.h index 127e0d2406c..c671d5605c9 100644 --- a/Straight_skeleton_2/include/CGAL/certified_numeric_predicates.h +++ b/Straight_skeleton_2/include/CGAL/certified_numeric_predicates.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Straight_skeleton_2/include/CGAL/certified_quotient_predicates.h b/Straight_skeleton_2/include/CGAL/certified_quotient_predicates.h index e9a8d5a5a0d..6ee5958812b 100644 --- a/Straight_skeleton_2/include/CGAL/certified_quotient_predicates.h +++ b/Straight_skeleton_2/include/CGAL/certified_quotient_predicates.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Stream_support/include/CGAL/IO/File_header_OFF.h b/Stream_support/include/CGAL/IO/File_header_OFF.h index 117f0551fef..179c3a81343 100644 --- a/Stream_support/include/CGAL/IO/File_header_OFF.h +++ b/Stream_support/include/CGAL/IO/File_header_OFF.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Stream_support/include/CGAL/IO/File_header_extended_OFF.h b/Stream_support/include/CGAL/IO/File_header_extended_OFF.h index 9a4527d8613..75679a488b2 100644 --- a/Stream_support/include/CGAL/IO/File_header_extended_OFF.h +++ b/Stream_support/include/CGAL/IO/File_header_extended_OFF.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Stream_support/include/CGAL/IO/File_header_gocad.h b/Stream_support/include/CGAL/IO/File_header_gocad.h index 8969adeffa8..620b6e23c56 100644 --- a/Stream_support/include/CGAL/IO/File_header_gocad.h +++ b/Stream_support/include/CGAL/IO/File_header_gocad.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Stream_support/include/CGAL/IO/File_scanner_OFF.h b/Stream_support/include/CGAL/IO/File_scanner_OFF.h index c5a5536f6e5..62d24f351f9 100644 --- a/Stream_support/include/CGAL/IO/File_scanner_OFF.h +++ b/Stream_support/include/CGAL/IO/File_scanner_OFF.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Stream_support/include/CGAL/IO/File_writer_OFF.h b/Stream_support/include/CGAL/IO/File_writer_OFF.h index 9117f5a0b5c..ae1d35b568f 100644 --- a/Stream_support/include/CGAL/IO/File_writer_OFF.h +++ b/Stream_support/include/CGAL/IO/File_writer_OFF.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Stream_support/include/CGAL/IO/File_writer_VRML_2.h b/Stream_support/include/CGAL/IO/File_writer_VRML_2.h index c066a0fc3e2..174f8ad307a 100644 --- a/Stream_support/include/CGAL/IO/File_writer_VRML_2.h +++ b/Stream_support/include/CGAL/IO/File_writer_VRML_2.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Stream_support/include/CGAL/IO/File_writer_gocad.h b/Stream_support/include/CGAL/IO/File_writer_gocad.h index 72f981b27d2..2267c66e3a5 100644 --- a/Stream_support/include/CGAL/IO/File_writer_gocad.h +++ b/Stream_support/include/CGAL/IO/File_writer_gocad.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Stream_support/include/CGAL/IO/File_writer_inventor.h b/Stream_support/include/CGAL/IO/File_writer_inventor.h index 91e1bc02e22..b6948d06d81 100644 --- a/Stream_support/include/CGAL/IO/File_writer_inventor.h +++ b/Stream_support/include/CGAL/IO/File_writer_inventor.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Stream_support/include/CGAL/IO/File_writer_wavefront.h b/Stream_support/include/CGAL/IO/File_writer_wavefront.h index c52032c8680..d3ee8cbf05e 100644 --- a/Stream_support/include/CGAL/IO/File_writer_wavefront.h +++ b/Stream_support/include/CGAL/IO/File_writer_wavefront.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Stream_support/include/CGAL/IO/Generic_writer.h b/Stream_support/include/CGAL/IO/Generic_writer.h index 3aac889160b..2e8395c8cca 100644 --- a/Stream_support/include/CGAL/IO/Generic_writer.h +++ b/Stream_support/include/CGAL/IO/Generic_writer.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Stream_support/include/CGAL/IO/Istream_iterator.h b/Stream_support/include/CGAL/IO/Istream_iterator.h index 6ce7b26d802..e89dda74d60 100644 --- a/Stream_support/include/CGAL/IO/Istream_iterator.h +++ b/Stream_support/include/CGAL/IO/Istream_iterator.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Stream_support/include/CGAL/IO/Ostream_iterator.h b/Stream_support/include/CGAL/IO/Ostream_iterator.h index fcbb5cd784a..386b8e9e120 100644 --- a/Stream_support/include/CGAL/IO/Ostream_iterator.h +++ b/Stream_support/include/CGAL/IO/Ostream_iterator.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Stream_support/include/CGAL/IO/Scanner_OFF.h b/Stream_support/include/CGAL/IO/Scanner_OFF.h index 556b0a7c78d..38bd4263ab0 100644 --- a/Stream_support/include/CGAL/IO/Scanner_OFF.h +++ b/Stream_support/include/CGAL/IO/Scanner_OFF.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Stream_support/include/CGAL/IO/Verbose_ostream.h b/Stream_support/include/CGAL/IO/Verbose_ostream.h index 64677b6513e..ede54929a34 100644 --- a/Stream_support/include/CGAL/IO/Verbose_ostream.h +++ b/Stream_support/include/CGAL/IO/Verbose_ostream.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Stream_support/include/CGAL/IO/Writer_OFF.h b/Stream_support/include/CGAL/IO/Writer_OFF.h index 3fd61f4c4f4..34be7cc5549 100644 --- a/Stream_support/include/CGAL/IO/Writer_OFF.h +++ b/Stream_support/include/CGAL/IO/Writer_OFF.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Stream_support/include/CGAL/IO/binary_file_io.h b/Stream_support/include/CGAL/IO/binary_file_io.h index 0f4e8c5ce04..9a8c3f85ecb 100644 --- a/Stream_support/include/CGAL/IO/binary_file_io.h +++ b/Stream_support/include/CGAL/IO/binary_file_io.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Stream_support/include/CGAL/IO/generic_copy_OFF.h b/Stream_support/include/CGAL/IO/generic_copy_OFF.h index e8930132550..504bae1f320 100644 --- a/Stream_support/include/CGAL/IO/generic_copy_OFF.h +++ b/Stream_support/include/CGAL/IO/generic_copy_OFF.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Stream_support/src/CGAL/File_header_OFF.cpp b/Stream_support/src/CGAL/File_header_OFF.cpp index 570fb35d862..71112bbca18 100644 --- a/Stream_support/src/CGAL/File_header_OFF.cpp +++ b/Stream_support/src/CGAL/File_header_OFF.cpp @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Stream_support/src/CGAL/File_header_extended_OFF.cpp b/Stream_support/src/CGAL/File_header_extended_OFF.cpp index 983633daaeb..3f709ff65fa 100644 --- a/Stream_support/src/CGAL/File_header_extended_OFF.cpp +++ b/Stream_support/src/CGAL/File_header_extended_OFF.cpp @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Stream_support/src/CGAL/File_scanner_OFF.cpp b/Stream_support/src/CGAL/File_scanner_OFF.cpp index c192069b4de..3361a458680 100644 --- a/Stream_support/src/CGAL/File_scanner_OFF.cpp +++ b/Stream_support/src/CGAL/File_scanner_OFF.cpp @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Stream_support/src/CGAL/File_writer_OFF.cpp b/Stream_support/src/CGAL/File_writer_OFF.cpp index 963c2fceefe..cb288f2d6b4 100644 --- a/Stream_support/src/CGAL/File_writer_OFF.cpp +++ b/Stream_support/src/CGAL/File_writer_OFF.cpp @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Stream_support/src/CGAL/File_writer_VRML_2.cpp b/Stream_support/src/CGAL/File_writer_VRML_2.cpp index 7cf59839695..ecec30c2535 100644 --- a/Stream_support/src/CGAL/File_writer_VRML_2.cpp +++ b/Stream_support/src/CGAL/File_writer_VRML_2.cpp @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Stream_support/src/CGAL/File_writer_inventor.cpp b/Stream_support/src/CGAL/File_writer_inventor.cpp index d62f9fa329e..e40a1d0dd65 100644 --- a/Stream_support/src/CGAL/File_writer_inventor.cpp +++ b/Stream_support/src/CGAL/File_writer_inventor.cpp @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Stream_support/src/CGAL/File_writer_wavefront.cpp b/Stream_support/src/CGAL/File_writer_wavefront.cpp index bddf734fb1b..2fee7344ad6 100644 --- a/Stream_support/src/CGAL/File_writer_wavefront.cpp +++ b/Stream_support/src/CGAL/File_writer_wavefront.cpp @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Subdivision_method_3/include/CGAL/Polyhedron_decorator_3.h b/Subdivision_method_3/include/CGAL/Polyhedron_decorator_3.h index ae98d8a6aae..42ff1e7dbe6 100644 --- a/Subdivision_method_3/include/CGAL/Polyhedron_decorator_3.h +++ b/Subdivision_method_3/include/CGAL/Polyhedron_decorator_3.h @@ -4,8 +4,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Subdivision_method_3/include/CGAL/Subdivision_mask_3.h b/Subdivision_method_3/include/CGAL/Subdivision_mask_3.h index 919495fe91a..b63cfe6fd35 100644 --- a/Subdivision_method_3/include/CGAL/Subdivision_mask_3.h +++ b/Subdivision_method_3/include/CGAL/Subdivision_mask_3.h @@ -4,8 +4,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Subdivision_method_3/include/CGAL/Subdivision_method_3.h b/Subdivision_method_3/include/CGAL/Subdivision_method_3.h index 0cea54951f0..e0eec82c011 100644 --- a/Subdivision_method_3/include/CGAL/Subdivision_method_3.h +++ b/Subdivision_method_3/include/CGAL/Subdivision_method_3.h @@ -4,8 +4,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Subdivision_method_3/include/CGAL/Subdivision_method_impl_3.h b/Subdivision_method_3/include/CGAL/Subdivision_method_impl_3.h index 1859504dab9..09681dd14c8 100644 --- a/Subdivision_method_3/include/CGAL/Subdivision_method_impl_3.h +++ b/Subdivision_method_3/include/CGAL/Subdivision_method_impl_3.h @@ -4,8 +4,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Surface_mesher/include/CGAL/Surface_mesher/Profile_counter.h b/Surface_mesher/include/CGAL/Surface_mesher/Profile_counter.h index ada20ae55ff..b0cb8c24615 100644 --- a/Surface_mesher/include/CGAL/Surface_mesher/Profile_counter.h +++ b/Surface_mesher/include/CGAL/Surface_mesher/Profile_counter.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Testsuite/include/CGAL/Testsuite/use.h b/Testsuite/include/CGAL/Testsuite/use.h index 6259aafb03a..0e7aca616ed 100644 --- a/Testsuite/include/CGAL/Testsuite/use.h +++ b/Testsuite/include/CGAL/Testsuite/use.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Testsuite/include/CGAL/Testsuite/vc_debug_hook.h b/Testsuite/include/CGAL/Testsuite/vc_debug_hook.h index 1bf4cf56867..b1a6d39d305 100644 --- a/Testsuite/include/CGAL/Testsuite/vc_debug_hook.h +++ b/Testsuite/include/CGAL/Testsuite/vc_debug_hook.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Triangulation_2/include/CGAL/apply_to_range.h b/Triangulation_2/include/CGAL/apply_to_range.h index 49ed706f777..be64da04047 100644 --- a/Triangulation_2/include/CGAL/apply_to_range.h +++ b/Triangulation_2/include/CGAL/apply_to_range.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Union_find/include/CGAL/Union_find.h b/Union_find/include/CGAL/Union_find.h index 6b58e003cd2..8049ccac658 100644 --- a/Union_find/include/CGAL/Union_find.h +++ b/Union_find/include/CGAL/Union_find.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/copyright b/copyright index 49c90c8264d..7f55f8278ab 100644 --- a/copyright +++ b/copyright @@ -81,7 +81,7 @@ R = RU Groningen Nef_3 M Nef_S2 M Number_types ETIMU - OpenNL third party lib under LGPL 2.1; Bruno Levy agrees to upgrade + OpenNL third party lib under LGPL 3 Optimisation_basic E Optimisation_doc E Partition_2 M diff --git a/iostream/include/CGAL/IO/Color.h b/iostream/include/CGAL/IO/Color.h index 33cd8980402..9a8e02bcf15 100644 --- a/iostream/include/CGAL/IO/Color.h +++ b/iostream/include/CGAL/IO/Color.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/iostream/include/CGAL/IO/io.h b/iostream/include/CGAL/IO/io.h index bc7f8bed446..826a676f809 100644 --- a/iostream/include/CGAL/IO/io.h +++ b/iostream/include/CGAL/IO/io.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/iostream/include/CGAL/IO/io_tags.h b/iostream/include/CGAL/IO/io_tags.h index 953c3c6df5a..47a1c737eaa 100644 --- a/iostream/include/CGAL/IO/io_tags.h +++ b/iostream/include/CGAL/IO/io_tags.h @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/iostream/src/CGAL/Color.cpp b/iostream/src/CGAL/Color.cpp index a3593c0698e..ed3b49ee99a 100644 --- a/iostream/src/CGAL/Color.cpp +++ b/iostream/src/CGAL/Color.cpp @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/iostream/src/CGAL/io.cpp b/iostream/src/CGAL/io.cpp index 62be4a76377..955ed6a2e2a 100644 --- a/iostream/src/CGAL/io.cpp +++ b/iostream/src/CGAL/io.cpp @@ -7,8 +7,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. From 3dfc826c5145408bc2362c1b0300ee2b64d2ae35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Mon, 10 Oct 2011 14:04:01 +0000 Subject: [PATCH 24/75] LGPLv2.1 -> LGPLv3 for ImageIO --- CGALimageIO/include/CGAL/ImageIO.h | 3 +-- CGALimageIO/include/CGAL/ImageIO/export.h | 4 ++-- CGALimageIO/include/CGAL/Image_3.h | 4 ++-- CGALimageIO/include/CGAL/Image_3_vtk_interface.h | 4 ++-- CGALimageIO/src/CGALImageIO/ImageIO.cpp | 2 +- CGALimageIO/src/CGALImageIO/Image_3.cpp | 4 ++-- CGALimageIO/src/CGALImageIO/LICENSE | 3 +-- CGALimageIO/src/CGALImageIO/analyze.cpp | 3 +-- CGALimageIO/src/CGALImageIO/analyze.h | 3 +-- CGALimageIO/src/CGALImageIO/bmp.cpp | 3 +-- CGALimageIO/src/CGALImageIO/bmp.h | 3 +-- CGALimageIO/src/CGALImageIO/bmpendian.cpp | 3 +-- CGALimageIO/src/CGALImageIO/bmpendian.h | 3 +-- CGALimageIO/src/CGALImageIO/bmpread.cpp | 3 +-- CGALimageIO/src/CGALImageIO/bmpread.h | 3 +-- CGALimageIO/src/CGALImageIO/bmptypes.h | 3 +-- CGALimageIO/src/CGALImageIO/convert.cpp | 3 +-- CGALimageIO/src/CGALImageIO/convert.h | 3 +-- CGALimageIO/src/CGALImageIO/fgetns.cpp | 3 +-- CGALimageIO/src/CGALImageIO/fgetns.h | 3 +-- CGALimageIO/src/CGALImageIO/gif.cpp | 3 +-- CGALimageIO/src/CGALImageIO/gif.h | 3 +-- CGALimageIO/src/CGALImageIO/gis.cpp | 3 +-- CGALimageIO/src/CGALImageIO/gis.h | 3 +-- CGALimageIO/src/CGALImageIO/inr.cpp | 3 +-- CGALimageIO/src/CGALImageIO/inr.h | 3 +-- CGALimageIO/src/CGALImageIO/iris.cpp | 3 +-- CGALimageIO/src/CGALImageIO/iris.h | 3 +-- CGALimageIO/src/CGALImageIO/mincio.cpp | 3 +-- CGALimageIO/src/CGALImageIO/mincio.h | 3 +-- CGALimageIO/src/CGALImageIO/pnm.cpp | 3 +-- CGALimageIO/src/CGALImageIO/pnm.h | 3 +-- CGALimageIO/src/CGALImageIO/recbuffer.cpp | 3 +-- CGALimageIO/src/CGALImageIO/recbuffer.h | 3 +-- CGALimageIO/src/CGALImageIO/recline.cpp | 3 +-- CGALimageIO/src/CGALImageIO/recline.h | 3 +-- CGALimageIO/src/CGALImageIO/reech4x4.cpp | 3 +-- CGALimageIO/src/CGALImageIO/reech4x4.h | 3 +-- CGALimageIO/src/CGALImageIO/typedefs.h | 3 +-- Maintenance/deb/sid/debian/copyright | 2 +- Maintenance/deb/squeeze/debian/copyright | 2 +- Maintenance/deb/wheezy/debian/copyright | 2 +- 42 files changed, 46 insertions(+), 80 deletions(-) diff --git a/CGALimageIO/include/CGAL/ImageIO.h b/CGALimageIO/include/CGAL/ImageIO.h index ef58411395c..7aaa654fba8 100644 --- a/CGALimageIO/include/CGAL/ImageIO.h +++ b/CGALimageIO/include/CGAL/ImageIO.h @@ -6,8 +6,7 @@ // The files in this directory are part of the ImageIO Library. // You can redistribute them and/or modify them under the terms of the // GNU Lesser General Public License as published by the Free Software Foundation; -// version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/include/CGAL/ImageIO/export.h b/CGALimageIO/include/CGAL/ImageIO/export.h index 65f7013e940..c9f4667691b 100755 --- a/CGALimageIO/include/CGAL/ImageIO/export.h +++ b/CGALimageIO/include/CGAL/ImageIO/export.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/include/CGAL/Image_3.h b/CGALimageIO/include/CGAL/Image_3.h index 696291819b8..38096f79540 100644 --- a/CGALimageIO/include/CGAL/Image_3.h +++ b/CGALimageIO/include/CGAL/Image_3.h @@ -4,8 +4,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/include/CGAL/Image_3_vtk_interface.h b/CGALimageIO/include/CGAL/Image_3_vtk_interface.h index ad74fdf9c43..9f8501f663f 100644 --- a/CGALimageIO/include/CGAL/Image_3_vtk_interface.h +++ b/CGALimageIO/include/CGAL/Image_3_vtk_interface.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/src/CGALImageIO/ImageIO.cpp b/CGALimageIO/src/CGALImageIO/ImageIO.cpp index c9e79f601c7..9cb03d3f8e1 100644 --- a/CGALimageIO/src/CGALImageIO/ImageIO.cpp +++ b/CGALimageIO/src/CGALImageIO/ImageIO.cpp @@ -6,7 +6,7 @@ // The files in this directory are part of the ImageIO Library. // You can redistribute them and/or modify them under the terms of the // GNU Lesser General Public License as published by the Free Software Foundation; -// version 2.1 of the License. See the file /usr/share/common-licenses/LGPL-2.1. +// version 3 of the License. See the file /usr/share/common-licenses/LGPL-3. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/src/CGALImageIO/Image_3.cpp b/CGALimageIO/src/CGALImageIO/Image_3.cpp index c1f4b86a97d..f0f5e028903 100644 --- a/CGALimageIO/src/CGALImageIO/Image_3.cpp +++ b/CGALimageIO/src/CGALImageIO/Image_3.cpp @@ -4,8 +4,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/src/CGALImageIO/LICENSE b/CGALimageIO/src/CGALImageIO/LICENSE index 179cbe259cf..08d4e2694b8 100644 --- a/CGALimageIO/src/CGALImageIO/LICENSE +++ b/CGALimageIO/src/CGALImageIO/LICENSE @@ -4,8 +4,7 @@ // The files in this directory are part of the ImageIO Library. // You can redistribute them and/or modify them under the terms of the // GNU Lesser General Public License as published by the Free Software Foundation; -// version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/src/CGALImageIO/analyze.cpp b/CGALimageIO/src/CGALImageIO/analyze.cpp index 7fb642d0b00..16039da055c 100644 --- a/CGALimageIO/src/CGALImageIO/analyze.cpp +++ b/CGALimageIO/src/CGALImageIO/analyze.cpp @@ -5,8 +5,7 @@ // CGAL (www.cgal.org). // You can redistribute it and/or modify it under the terms of the // GNU Lesser General Public License as published by the Free Software Foundation; -// version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/src/CGALImageIO/analyze.h b/CGALimageIO/src/CGALImageIO/analyze.h index 10b336afc8d..3132f67a2d5 100644 --- a/CGALimageIO/src/CGALImageIO/analyze.h +++ b/CGALimageIO/src/CGALImageIO/analyze.h @@ -5,8 +5,7 @@ // CGAL (www.cgal.org). // You can redistribute it and/or modify it under the terms of the // GNU Lesser General Public License as published by the Free Software Foundation; -// version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/src/CGALImageIO/bmp.cpp b/CGALimageIO/src/CGALImageIO/bmp.cpp index f4b405384e8..a30035d2e50 100644 --- a/CGALimageIO/src/CGALImageIO/bmp.cpp +++ b/CGALimageIO/src/CGALImageIO/bmp.cpp @@ -5,8 +5,7 @@ // CGAL (www.cgal.org). // You can redistribute it and/or modify it under the terms of the // GNU Lesser General Public License as published by the Free Software Foundation; -// version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/src/CGALImageIO/bmp.h b/CGALimageIO/src/CGALImageIO/bmp.h index 3ee7edee401..b3f1af20029 100644 --- a/CGALimageIO/src/CGALImageIO/bmp.h +++ b/CGALimageIO/src/CGALImageIO/bmp.h @@ -5,8 +5,7 @@ // CGAL (www.cgal.org). // You can redistribute it and/or modify it under the terms of the // GNU Lesser General Public License as published by the Free Software Foundation; -// version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/src/CGALImageIO/bmpendian.cpp b/CGALimageIO/src/CGALImageIO/bmpendian.cpp index ee599129cda..64c8bc33f67 100644 --- a/CGALimageIO/src/CGALImageIO/bmpendian.cpp +++ b/CGALimageIO/src/CGALImageIO/bmpendian.cpp @@ -5,8 +5,7 @@ // CGAL (www.cgal.org). // You can redistribute it and/or modify it under the terms of the // GNU Lesser General Public License as published by the Free Software Foundation; -// version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/src/CGALImageIO/bmpendian.h b/CGALimageIO/src/CGALImageIO/bmpendian.h index 993db4ac4a7..1ec25a0360d 100644 --- a/CGALimageIO/src/CGALImageIO/bmpendian.h +++ b/CGALimageIO/src/CGALImageIO/bmpendian.h @@ -5,8 +5,7 @@ // CGAL (www.cgal.org). // You can redistribute it and/or modify it under the terms of the // GNU Lesser General Public License as published by the Free Software Foundation; -// version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/src/CGALImageIO/bmpread.cpp b/CGALimageIO/src/CGALImageIO/bmpread.cpp index 034c4626b84..ce6954274de 100644 --- a/CGALimageIO/src/CGALImageIO/bmpread.cpp +++ b/CGALimageIO/src/CGALImageIO/bmpread.cpp @@ -5,8 +5,7 @@ // CGAL (www.cgal.org). // You can redistribute it and/or modify it under the terms of the // GNU Lesser General Public License as published by the Free Software Foundation; -// version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/src/CGALImageIO/bmpread.h b/CGALimageIO/src/CGALImageIO/bmpread.h index dc00db8a229..79798d90786 100644 --- a/CGALimageIO/src/CGALImageIO/bmpread.h +++ b/CGALimageIO/src/CGALImageIO/bmpread.h @@ -5,8 +5,7 @@ // CGAL (www.cgal.org). // You can redistribute it and/or modify it under the terms of the // GNU Lesser General Public License as published by the Free Software Foundation; -// version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/src/CGALImageIO/bmptypes.h b/CGALimageIO/src/CGALImageIO/bmptypes.h index 201c3bf13ac..ed717f41b67 100644 --- a/CGALimageIO/src/CGALImageIO/bmptypes.h +++ b/CGALimageIO/src/CGALImageIO/bmptypes.h @@ -5,8 +5,7 @@ // CGAL (www.cgal.org). // You can redistribute it and/or modify it under the terms of the // GNU Lesser General Public License as published by the Free Software Foundation; -// version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/src/CGALImageIO/convert.cpp b/CGALimageIO/src/CGALImageIO/convert.cpp index c7c09c097b8..9c2d52e5663 100644 --- a/CGALimageIO/src/CGALImageIO/convert.cpp +++ b/CGALimageIO/src/CGALImageIO/convert.cpp @@ -5,8 +5,7 @@ // CGAL (www.cgal.org). // You can redistribute it and/or modify it under the terms of the // GNU Lesser General Public License as published by the Free Software Foundation; -// version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/src/CGALImageIO/convert.h b/CGALimageIO/src/CGALImageIO/convert.h index 8c3b0570223..1fd092a102e 100644 --- a/CGALimageIO/src/CGALImageIO/convert.h +++ b/CGALimageIO/src/CGALImageIO/convert.h @@ -5,8 +5,7 @@ // CGAL (www.cgal.org). // You can redistribute it and/or modify it under the terms of the // GNU Lesser General Public License as published by the Free Software Foundation; -// version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/src/CGALImageIO/fgetns.cpp b/CGALimageIO/src/CGALImageIO/fgetns.cpp index ea603e35fd9..423cd37557c 100644 --- a/CGALimageIO/src/CGALImageIO/fgetns.cpp +++ b/CGALimageIO/src/CGALImageIO/fgetns.cpp @@ -5,8 +5,7 @@ // CGAL (www.cgal.org). // You can redistribute it and/or modify it under the terms of the // GNU Lesser General Public License as published by the Free Software Foundation; -// version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/src/CGALImageIO/fgetns.h b/CGALimageIO/src/CGALImageIO/fgetns.h index c7ffb38fbae..9195d30f6ee 100644 --- a/CGALimageIO/src/CGALImageIO/fgetns.h +++ b/CGALimageIO/src/CGALImageIO/fgetns.h @@ -5,8 +5,7 @@ // CGAL (www.cgal.org). // You can redistribute it and/or modify it under the terms of the // GNU Lesser General Public License as published by the Free Software Foundation; -// version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/src/CGALImageIO/gif.cpp b/CGALimageIO/src/CGALImageIO/gif.cpp index 9d8a9634f1f..e40a16cd5d4 100644 --- a/CGALimageIO/src/CGALImageIO/gif.cpp +++ b/CGALimageIO/src/CGALImageIO/gif.cpp @@ -5,8 +5,7 @@ // CGAL (www.cgal.org). // You can redistribute it and/or modify it under the terms of the // GNU Lesser General Public License as published by the Free Software Foundation; -// version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/src/CGALImageIO/gif.h b/CGALimageIO/src/CGALImageIO/gif.h index 9b80f3d9f1d..ac2bf860f0d 100644 --- a/CGALimageIO/src/CGALImageIO/gif.h +++ b/CGALimageIO/src/CGALImageIO/gif.h @@ -5,8 +5,7 @@ // CGAL (www.cgal.org). // You can redistribute it and/or modify it under the terms of the // GNU Lesser General Public License as published by the Free Software Foundation; -// version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/src/CGALImageIO/gis.cpp b/CGALimageIO/src/CGALImageIO/gis.cpp index 55d08a227fa..8755e8e361e 100644 --- a/CGALimageIO/src/CGALImageIO/gis.cpp +++ b/CGALimageIO/src/CGALImageIO/gis.cpp @@ -5,8 +5,7 @@ // CGAL (www.cgal.org). // You can redistribute it and/or modify it under the terms of the // GNU Lesser General Public License as published by the Free Software Foundation; -// version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/src/CGALImageIO/gis.h b/CGALimageIO/src/CGALImageIO/gis.h index b9496fa5df8..4ddfddc9406 100644 --- a/CGALimageIO/src/CGALImageIO/gis.h +++ b/CGALimageIO/src/CGALImageIO/gis.h @@ -5,8 +5,7 @@ // CGAL (www.cgal.org). // You can redistribute it and/or modify it under the terms of the // GNU Lesser General Public License as published by the Free Software Foundation; -// version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/src/CGALImageIO/inr.cpp b/CGALimageIO/src/CGALImageIO/inr.cpp index 11175d5c7bf..8dbba04586f 100644 --- a/CGALimageIO/src/CGALImageIO/inr.cpp +++ b/CGALimageIO/src/CGALImageIO/inr.cpp @@ -5,8 +5,7 @@ // CGAL (www.cgal.org). // You can redistribute it and/or modify it under the terms of the // GNU Lesser General Public License as published by the Free Software Foundation; -// version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/src/CGALImageIO/inr.h b/CGALimageIO/src/CGALImageIO/inr.h index 4ab22e2aeaa..c6df6531335 100644 --- a/CGALimageIO/src/CGALImageIO/inr.h +++ b/CGALimageIO/src/CGALImageIO/inr.h @@ -5,8 +5,7 @@ // CGAL (www.cgal.org). // You can redistribute it and/or modify it under the terms of the // GNU Lesser General Public License as published by the Free Software Foundation; -// version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/src/CGALImageIO/iris.cpp b/CGALimageIO/src/CGALImageIO/iris.cpp index e97c61d6292..1c0affca4d3 100644 --- a/CGALimageIO/src/CGALImageIO/iris.cpp +++ b/CGALimageIO/src/CGALImageIO/iris.cpp @@ -5,8 +5,7 @@ // CGAL (www.cgal.org). // You can redistribute it and/or modify it under the terms of the // GNU Lesser General Public License as published by the Free Software Foundation; -// version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/src/CGALImageIO/iris.h b/CGALimageIO/src/CGALImageIO/iris.h index 52db0bf3e79..09ba2509956 100644 --- a/CGALimageIO/src/CGALImageIO/iris.h +++ b/CGALimageIO/src/CGALImageIO/iris.h @@ -5,8 +5,7 @@ // CGAL (www.cgal.org). // You can redistribute it and/or modify it under the terms of the // GNU Lesser General Public License as published by the Free Software Foundation; -// version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/src/CGALImageIO/mincio.cpp b/CGALimageIO/src/CGALImageIO/mincio.cpp index 6c766e4c05a..ea7ca0c4d66 100644 --- a/CGALimageIO/src/CGALImageIO/mincio.cpp +++ b/CGALimageIO/src/CGALImageIO/mincio.cpp @@ -5,8 +5,7 @@ // CGAL (www.cgal.org). // You can redistribute it and/or modify it under the terms of the // GNU Lesser General Public License as published by the Free Software Foundation; -// version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/src/CGALImageIO/mincio.h b/CGALimageIO/src/CGALImageIO/mincio.h index 83f044ce488..c067ffae088 100644 --- a/CGALimageIO/src/CGALImageIO/mincio.h +++ b/CGALimageIO/src/CGALImageIO/mincio.h @@ -5,8 +5,7 @@ // CGAL (www.cgal.org). // You can redistribute it and/or modify it under the terms of the // GNU Lesser General Public License as published by the Free Software Foundation; -// version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/src/CGALImageIO/pnm.cpp b/CGALimageIO/src/CGALImageIO/pnm.cpp index 4fbcbf8fdb4..2ab1780a2bd 100644 --- a/CGALimageIO/src/CGALImageIO/pnm.cpp +++ b/CGALimageIO/src/CGALImageIO/pnm.cpp @@ -5,8 +5,7 @@ // CGAL (www.cgal.org). // You can redistribute it and/or modify it under the terms of the // GNU Lesser General Public License as published by the Free Software Foundation; -// version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/src/CGALImageIO/pnm.h b/CGALimageIO/src/CGALImageIO/pnm.h index 1d7448e166c..03ebdd1a70d 100644 --- a/CGALimageIO/src/CGALImageIO/pnm.h +++ b/CGALimageIO/src/CGALImageIO/pnm.h @@ -5,8 +5,7 @@ // CGAL (www.cgal.org). // You can redistribute it and/or modify it under the terms of the // GNU Lesser General Public License as published by the Free Software Foundation; -// version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/src/CGALImageIO/recbuffer.cpp b/CGALimageIO/src/CGALImageIO/recbuffer.cpp index e0630aeffd3..2798a5c5784 100644 --- a/CGALimageIO/src/CGALImageIO/recbuffer.cpp +++ b/CGALimageIO/src/CGALImageIO/recbuffer.cpp @@ -5,8 +5,7 @@ // CGAL (www.cgal.org). // You can redistribute it and/or modify it under the terms of the // GNU Lesser General Public License as published by the Free Software Foundation; -// version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/src/CGALImageIO/recbuffer.h b/CGALimageIO/src/CGALImageIO/recbuffer.h index d4bb5c33add..f283227e50e 100644 --- a/CGALimageIO/src/CGALImageIO/recbuffer.h +++ b/CGALimageIO/src/CGALImageIO/recbuffer.h @@ -5,8 +5,7 @@ // CGAL (www.cgal.org). // You can redistribute it and/or modify it under the terms of the // GNU Lesser General Public License as published by the Free Software Foundation; -// version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/src/CGALImageIO/recline.cpp b/CGALimageIO/src/CGALImageIO/recline.cpp index 840cf08748a..29dfa9b5635 100644 --- a/CGALimageIO/src/CGALImageIO/recline.cpp +++ b/CGALimageIO/src/CGALImageIO/recline.cpp @@ -5,8 +5,7 @@ // CGAL (www.cgal.org). // You can redistribute it and/or modify it under the terms of the // GNU Lesser General Public License as published by the Free Software Foundation; -// version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/src/CGALImageIO/recline.h b/CGALimageIO/src/CGALImageIO/recline.h index 4a5bb7d30fd..78f869a5224 100644 --- a/CGALimageIO/src/CGALImageIO/recline.h +++ b/CGALimageIO/src/CGALImageIO/recline.h @@ -5,8 +5,7 @@ // CGAL (www.cgal.org). // You can redistribute it and/or modify it under the terms of the // GNU Lesser General Public License as published by the Free Software Foundation; -// version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/src/CGALImageIO/reech4x4.cpp b/CGALimageIO/src/CGALImageIO/reech4x4.cpp index 9e5b4efead3..ffe6c8a07d4 100644 --- a/CGALimageIO/src/CGALImageIO/reech4x4.cpp +++ b/CGALimageIO/src/CGALImageIO/reech4x4.cpp @@ -5,8 +5,7 @@ // CGAL (www.cgal.org). // You can redistribute it and/or modify it under the terms of the // GNU Lesser General Public License as published by the Free Software Foundation; -// version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/src/CGALImageIO/reech4x4.h b/CGALimageIO/src/CGALImageIO/reech4x4.h index fa0486553a4..2e751d109bd 100644 --- a/CGALimageIO/src/CGALImageIO/reech4x4.h +++ b/CGALimageIO/src/CGALImageIO/reech4x4.h @@ -5,8 +5,7 @@ // CGAL (www.cgal.org). // You can redistribute it and/or modify it under the terms of the // GNU Lesser General Public License as published by the Free Software Foundation; -// version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/src/CGALImageIO/typedefs.h b/CGALimageIO/src/CGALImageIO/typedefs.h index 06dc86fd59d..ff50abec6c6 100644 --- a/CGALimageIO/src/CGALImageIO/typedefs.h +++ b/CGALimageIO/src/CGALImageIO/typedefs.h @@ -5,8 +5,7 @@ // CGAL (www.cgal.org). // You can redistribute it and/or modify it under the terms of the // GNU Lesser General Public License as published by the Free Software Foundation; -// version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Maintenance/deb/sid/debian/copyright b/Maintenance/deb/sid/debian/copyright index 9e4534a1264..9d0295b8ecf 100644 --- a/Maintenance/deb/sid/debian/copyright +++ b/Maintenance/deb/sid/debian/copyright @@ -299,7 +299,7 @@ src/CGALimageIO. The files in this directory are part of the ImageIO Library. You can redistribute them and/or modify them under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; - version 2.1 of the License. See the file /usr/share/common-licenses/LGPL-2.1. + either version 3 of the License, or (at your option) any later version. Licensees holding a valid commercial license may use this file in accordance with the commercial license agreement provided with the software. diff --git a/Maintenance/deb/squeeze/debian/copyright b/Maintenance/deb/squeeze/debian/copyright index d20c1271fa3..9fc477c69da 100644 --- a/Maintenance/deb/squeeze/debian/copyright +++ b/Maintenance/deb/squeeze/debian/copyright @@ -299,7 +299,7 @@ src/CGALimageIO. The files in this directory are part of the ImageIO Library. You can redistribute them and/or modify them under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; - version 2.1 of the License. See the file /usr/share/common-licenses/LGPL-2.1. + either version 3 of the License, or (at your option) any later version. Licensees holding a valid commercial license may use this file in accordance with the commercial license agreement provided with the software. diff --git a/Maintenance/deb/wheezy/debian/copyright b/Maintenance/deb/wheezy/debian/copyright index b6cda7fe15d..3fabef4d23e 100644 --- a/Maintenance/deb/wheezy/debian/copyright +++ b/Maintenance/deb/wheezy/debian/copyright @@ -299,7 +299,7 @@ src/CGALimageIO. The files in this directory are part of the ImageIO Library. You can redistribute them and/or modify them under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; - version 2.1 of the License. See the file /usr/share/common-licenses/LGPL-2.1. + either version 3 of the License, or (at your option) any later version. Licensees holding a valid commercial license may use this file in accordance with the commercial license agreement provided with the software. From 5d420a9c2cfa8219dc9d00eb47e8ee246b97be66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Mon, 10 Oct 2011 14:06:06 +0000 Subject: [PATCH 25/75] undo license change in Cmap package --- Combinatorial_map/include/CGAL/Cell_attribute.h | 4 ++-- Combinatorial_map/include/CGAL/Cell_const_iterators.h | 4 ++-- Combinatorial_map/include/CGAL/Cell_iterators.h | 4 ++-- Combinatorial_map/include/CGAL/Combinatorial_map.h | 4 ++-- .../include/CGAL/Combinatorial_map_basic_operations.h | 4 ++-- .../include/CGAL/Combinatorial_map_constructors.h | 4 ++-- Combinatorial_map/include/CGAL/Combinatorial_map_min_items.h | 4 ++-- Combinatorial_map/include/CGAL/Combinatorial_map_operations.h | 4 ++-- Combinatorial_map/include/CGAL/Dart.h | 4 ++-- Combinatorial_map/include/CGAL/Dart_const_iterators.h | 4 ++-- Combinatorial_map/include/CGAL/Dart_iterators.h | 4 ++-- .../include/CGAL/internal/Combinatorial_map_functors.h | 4 ++-- .../include/CGAL/internal/Combinatorial_map_utility.h | 4 ++-- .../test/Combinatorial_map/Combinatorial_map_2_test.h | 4 ++-- .../test/Combinatorial_map/Combinatorial_map_3_test.h | 4 ++-- 15 files changed, 30 insertions(+), 30 deletions(-) diff --git a/Combinatorial_map/include/CGAL/Cell_attribute.h b/Combinatorial_map/include/CGAL/Cell_attribute.h index fb688ead6eb..c40bbc46d0f 100644 --- a/Combinatorial_map/include/CGAL/Cell_attribute.h +++ b/Combinatorial_map/include/CGAL/Cell_attribute.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; either version 3 of the License, -// or (at your option) any later version. +// published by the Free Software Foundation; version 2.1 of the License. +// See the file LICENSE.LGPL distributed with CGAL. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Combinatorial_map/include/CGAL/Cell_const_iterators.h b/Combinatorial_map/include/CGAL/Cell_const_iterators.h index d21a5824c50..f958e5cb71b 100644 --- a/Combinatorial_map/include/CGAL/Cell_const_iterators.h +++ b/Combinatorial_map/include/CGAL/Cell_const_iterators.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; either version 3 of the License, -// or (at your option) any later version. +// published by the Free Software Foundation; version 2.1 of the License. +// See the file LICENSE.LGPL distributed with CGAL. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Combinatorial_map/include/CGAL/Cell_iterators.h b/Combinatorial_map/include/CGAL/Cell_iterators.h index 376268a52fe..78246546d4c 100644 --- a/Combinatorial_map/include/CGAL/Cell_iterators.h +++ b/Combinatorial_map/include/CGAL/Cell_iterators.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; either version 3 of the License, -// or (at your option) any later version. +// published by the Free Software Foundation; version 2.1 of the License. +// See the file LICENSE.LGPL distributed with CGAL. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Combinatorial_map/include/CGAL/Combinatorial_map.h b/Combinatorial_map/include/CGAL/Combinatorial_map.h index ee296f30910..9e5c0f868dd 100644 --- a/Combinatorial_map/include/CGAL/Combinatorial_map.h +++ b/Combinatorial_map/include/CGAL/Combinatorial_map.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; either version 3 of the License, -// or (at your option) any later version. +// published by the Free Software Foundation; version 2.1 of the License. +// See the file LICENSE.LGPL distributed with CGAL. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Combinatorial_map/include/CGAL/Combinatorial_map_basic_operations.h b/Combinatorial_map/include/CGAL/Combinatorial_map_basic_operations.h index 5a5e7f36d03..e6c06b7d696 100644 --- a/Combinatorial_map/include/CGAL/Combinatorial_map_basic_operations.h +++ b/Combinatorial_map/include/CGAL/Combinatorial_map_basic_operations.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; either version 3 of the License, -// or (at your option) any later version. +// published by the Free Software Foundation; version 2.1 of the License. +// See the file LICENSE.LGPL distributed with CGAL. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Combinatorial_map/include/CGAL/Combinatorial_map_constructors.h b/Combinatorial_map/include/CGAL/Combinatorial_map_constructors.h index b7357001172..c21ff9229fe 100644 --- a/Combinatorial_map/include/CGAL/Combinatorial_map_constructors.h +++ b/Combinatorial_map/include/CGAL/Combinatorial_map_constructors.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; either version 3 of the License, -// or (at your option) any later version. +// published by the Free Software Foundation; version 2.1 of the License. +// See the file LICENSE.LGPL distributed with CGAL. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Combinatorial_map/include/CGAL/Combinatorial_map_min_items.h b/Combinatorial_map/include/CGAL/Combinatorial_map_min_items.h index a782e6511d1..11a305a8f56 100644 --- a/Combinatorial_map/include/CGAL/Combinatorial_map_min_items.h +++ b/Combinatorial_map/include/CGAL/Combinatorial_map_min_items.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; either version 3 of the License, -// or (at your option) any later version. +// published by the Free Software Foundation; version 2.1 of the License. +// See the file LICENSE.LGPL distributed with CGAL. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Combinatorial_map/include/CGAL/Combinatorial_map_operations.h b/Combinatorial_map/include/CGAL/Combinatorial_map_operations.h index 96aa9cbfe03..75185a1ae7f 100644 --- a/Combinatorial_map/include/CGAL/Combinatorial_map_operations.h +++ b/Combinatorial_map/include/CGAL/Combinatorial_map_operations.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; either version 3 of the License, -// or (at your option) any later version. +// published by the Free Software Foundation; version 2.1 of the License. +// See the file LICENSE.LGPL distributed with CGAL. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Combinatorial_map/include/CGAL/Dart.h b/Combinatorial_map/include/CGAL/Dart.h index 378ba7ad1a3..3db4780d4fd 100644 --- a/Combinatorial_map/include/CGAL/Dart.h +++ b/Combinatorial_map/include/CGAL/Dart.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; either version 3 of the License, -// or (at your option) any later version. +// published by the Free Software Foundation; version 2.1 of the License. +// See the file LICENSE.LGPL distributed with CGAL. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Combinatorial_map/include/CGAL/Dart_const_iterators.h b/Combinatorial_map/include/CGAL/Dart_const_iterators.h index dde0800692b..37e5d4f66a7 100644 --- a/Combinatorial_map/include/CGAL/Dart_const_iterators.h +++ b/Combinatorial_map/include/CGAL/Dart_const_iterators.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; either version 3 of the License, -// or (at your option) any later version. +// published by the Free Software Foundation; version 2.1 of the License. +// See the file LICENSE.LGPL distributed with CGAL. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Combinatorial_map/include/CGAL/Dart_iterators.h b/Combinatorial_map/include/CGAL/Dart_iterators.h index e3907ff515c..e0200fb45c6 100644 --- a/Combinatorial_map/include/CGAL/Dart_iterators.h +++ b/Combinatorial_map/include/CGAL/Dart_iterators.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; either version 3 of the License, -// or (at your option) any later version. +// published by the Free Software Foundation; version 2.1 of the License. +// See the file LICENSE.LGPL distributed with CGAL. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Combinatorial_map/include/CGAL/internal/Combinatorial_map_functors.h b/Combinatorial_map/include/CGAL/internal/Combinatorial_map_functors.h index 5a0b1ef34e0..f7fed3e586d 100644 --- a/Combinatorial_map/include/CGAL/internal/Combinatorial_map_functors.h +++ b/Combinatorial_map/include/CGAL/internal/Combinatorial_map_functors.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; either version 3 of the License, -// or (at your option) any later version. +// published by the Free Software Foundation; version 2.1 of the License. +// See the file LICENSE.LGPL distributed with CGAL. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Combinatorial_map/include/CGAL/internal/Combinatorial_map_utility.h b/Combinatorial_map/include/CGAL/internal/Combinatorial_map_utility.h index fee79ded604..1a4eae9c65c 100644 --- a/Combinatorial_map/include/CGAL/internal/Combinatorial_map_utility.h +++ b/Combinatorial_map/include/CGAL/internal/Combinatorial_map_utility.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; either version 3 of the License, -// or (at your option) any later version. +// published by the Free Software Foundation; version 2.1 of the License. +// See the file LICENSE.LGPL distributed with CGAL. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Combinatorial_map/test/Combinatorial_map/Combinatorial_map_2_test.h b/Combinatorial_map/test/Combinatorial_map/Combinatorial_map_2_test.h index 84d41ffa051..5fd0fc9a180 100644 --- a/Combinatorial_map/test/Combinatorial_map/Combinatorial_map_2_test.h +++ b/Combinatorial_map/test/Combinatorial_map/Combinatorial_map_2_test.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; either version 3 of the License, -// or (at your option) any later version. +// published by the Free Software Foundation; version 2.1 of the License. +// See the file LICENSE.LGPL distributed with CGAL. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Combinatorial_map/test/Combinatorial_map/Combinatorial_map_3_test.h b/Combinatorial_map/test/Combinatorial_map/Combinatorial_map_3_test.h index c64015f1386..6c51dc62fa3 100644 --- a/Combinatorial_map/test/Combinatorial_map/Combinatorial_map_3_test.h +++ b/Combinatorial_map/test/Combinatorial_map/Combinatorial_map_3_test.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; either version 3 of the License, -// or (at your option) any later version. +// published by the Free Software Foundation; version 2.1 of the License. +// See the file LICENSE.LGPL distributed with CGAL. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. From f26fe49316c5a09427613dc6ff2fc8a46f747663 Mon Sep 17 00:00:00 2001 From: Guillaume Damiand Date: Mon, 10 Oct 2011 14:39:37 +0000 Subject: [PATCH 26/75] Licence for Combinatorial_map --- Combinatorial_map/include/CGAL/Cell_attribute.h | 4 ++-- Combinatorial_map/include/CGAL/Cell_const_iterators.h | 4 ++-- Combinatorial_map/include/CGAL/Cell_iterators.h | 4 ++-- Combinatorial_map/include/CGAL/Combinatorial_map.h | 4 ++-- .../include/CGAL/Combinatorial_map_basic_operations.h | 4 ++-- .../include/CGAL/Combinatorial_map_constructors.h | 4 ++-- Combinatorial_map/include/CGAL/Combinatorial_map_min_items.h | 4 ++-- Combinatorial_map/include/CGAL/Combinatorial_map_operations.h | 4 ++-- Combinatorial_map/include/CGAL/Dart.h | 4 ++-- Combinatorial_map/include/CGAL/Dart_const_iterators.h | 4 ++-- Combinatorial_map/include/CGAL/Dart_iterators.h | 4 ++-- .../include/CGAL/internal/Combinatorial_map_functors.h | 4 ++-- .../include/CGAL/internal/Combinatorial_map_utility.h | 4 ++-- 13 files changed, 26 insertions(+), 26 deletions(-) diff --git a/Combinatorial_map/include/CGAL/Cell_attribute.h b/Combinatorial_map/include/CGAL/Cell_attribute.h index c40bbc46d0f..fb688ead6eb 100644 --- a/Combinatorial_map/include/CGAL/Cell_attribute.h +++ b/Combinatorial_map/include/CGAL/Cell_attribute.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Combinatorial_map/include/CGAL/Cell_const_iterators.h b/Combinatorial_map/include/CGAL/Cell_const_iterators.h index f958e5cb71b..d21a5824c50 100644 --- a/Combinatorial_map/include/CGAL/Cell_const_iterators.h +++ b/Combinatorial_map/include/CGAL/Cell_const_iterators.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Combinatorial_map/include/CGAL/Cell_iterators.h b/Combinatorial_map/include/CGAL/Cell_iterators.h index 78246546d4c..376268a52fe 100644 --- a/Combinatorial_map/include/CGAL/Cell_iterators.h +++ b/Combinatorial_map/include/CGAL/Cell_iterators.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Combinatorial_map/include/CGAL/Combinatorial_map.h b/Combinatorial_map/include/CGAL/Combinatorial_map.h index 9e5c0f868dd..ee296f30910 100644 --- a/Combinatorial_map/include/CGAL/Combinatorial_map.h +++ b/Combinatorial_map/include/CGAL/Combinatorial_map.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Combinatorial_map/include/CGAL/Combinatorial_map_basic_operations.h b/Combinatorial_map/include/CGAL/Combinatorial_map_basic_operations.h index e6c06b7d696..5a5e7f36d03 100644 --- a/Combinatorial_map/include/CGAL/Combinatorial_map_basic_operations.h +++ b/Combinatorial_map/include/CGAL/Combinatorial_map_basic_operations.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Combinatorial_map/include/CGAL/Combinatorial_map_constructors.h b/Combinatorial_map/include/CGAL/Combinatorial_map_constructors.h index c21ff9229fe..b7357001172 100644 --- a/Combinatorial_map/include/CGAL/Combinatorial_map_constructors.h +++ b/Combinatorial_map/include/CGAL/Combinatorial_map_constructors.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Combinatorial_map/include/CGAL/Combinatorial_map_min_items.h b/Combinatorial_map/include/CGAL/Combinatorial_map_min_items.h index 11a305a8f56..a782e6511d1 100644 --- a/Combinatorial_map/include/CGAL/Combinatorial_map_min_items.h +++ b/Combinatorial_map/include/CGAL/Combinatorial_map_min_items.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Combinatorial_map/include/CGAL/Combinatorial_map_operations.h b/Combinatorial_map/include/CGAL/Combinatorial_map_operations.h index 75185a1ae7f..96aa9cbfe03 100644 --- a/Combinatorial_map/include/CGAL/Combinatorial_map_operations.h +++ b/Combinatorial_map/include/CGAL/Combinatorial_map_operations.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Combinatorial_map/include/CGAL/Dart.h b/Combinatorial_map/include/CGAL/Dart.h index 3db4780d4fd..378ba7ad1a3 100644 --- a/Combinatorial_map/include/CGAL/Dart.h +++ b/Combinatorial_map/include/CGAL/Dart.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Combinatorial_map/include/CGAL/Dart_const_iterators.h b/Combinatorial_map/include/CGAL/Dart_const_iterators.h index 37e5d4f66a7..dde0800692b 100644 --- a/Combinatorial_map/include/CGAL/Dart_const_iterators.h +++ b/Combinatorial_map/include/CGAL/Dart_const_iterators.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Combinatorial_map/include/CGAL/Dart_iterators.h b/Combinatorial_map/include/CGAL/Dart_iterators.h index e0200fb45c6..e3907ff515c 100644 --- a/Combinatorial_map/include/CGAL/Dart_iterators.h +++ b/Combinatorial_map/include/CGAL/Dart_iterators.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Combinatorial_map/include/CGAL/internal/Combinatorial_map_functors.h b/Combinatorial_map/include/CGAL/internal/Combinatorial_map_functors.h index f7fed3e586d..5a0b1ef34e0 100644 --- a/Combinatorial_map/include/CGAL/internal/Combinatorial_map_functors.h +++ b/Combinatorial_map/include/CGAL/internal/Combinatorial_map_functors.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Combinatorial_map/include/CGAL/internal/Combinatorial_map_utility.h b/Combinatorial_map/include/CGAL/internal/Combinatorial_map_utility.h index 1a4eae9c65c..fee79ded604 100644 --- a/Combinatorial_map/include/CGAL/internal/Combinatorial_map_utility.h +++ b/Combinatorial_map/include/CGAL/internal/Combinatorial_map_utility.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. From 63aecbeba4723fff9c3925daacd8dc9b204b3d5a Mon Sep 17 00:00:00 2001 From: Guillaume Damiand Date: Mon, 10 Oct 2011 14:46:03 +0000 Subject: [PATCH 27/75] Licence in CMap tests --- .../test/Combinatorial_map/Combinatorial_map_2_test.h | 4 ++-- .../test/Combinatorial_map/Combinatorial_map_3_test.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Combinatorial_map/test/Combinatorial_map/Combinatorial_map_2_test.h b/Combinatorial_map/test/Combinatorial_map/Combinatorial_map_2_test.h index 5fd0fc9a180..84d41ffa051 100644 --- a/Combinatorial_map/test/Combinatorial_map/Combinatorial_map_2_test.h +++ b/Combinatorial_map/test/Combinatorial_map/Combinatorial_map_2_test.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Combinatorial_map/test/Combinatorial_map/Combinatorial_map_3_test.h b/Combinatorial_map/test/Combinatorial_map/Combinatorial_map_3_test.h index 6c51dc62fa3..c64015f1386 100644 --- a/Combinatorial_map/test/Combinatorial_map/Combinatorial_map_3_test.h +++ b/Combinatorial_map/test/Combinatorial_map/Combinatorial_map_3_test.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. From 961d58fa4b685726abfe9863a2b6491b6ba1b9ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Mon, 10 Oct 2011 16:07:44 +0000 Subject: [PATCH 28/75] update files with incorrect license headers (QPL but should be LGPL) --- Kernel_23/include/CGAL/Projection_traits_xy_3.h | 7 ++++--- Kernel_23/include/CGAL/Projection_traits_xz_3.h | 7 ++++--- Kernel_23/include/CGAL/Projection_traits_yz_3.h | 7 ++++--- Kernel_23/include/CGAL/internal/Projection_traits_3.h | 7 ++++--- Polynomial/include/CGAL/Polynomial/square_free_factorize.h | 7 ++++--- 5 files changed, 20 insertions(+), 15 deletions(-) diff --git a/Kernel_23/include/CGAL/Projection_traits_xy_3.h b/Kernel_23/include/CGAL/Projection_traits_xy_3.h index 7bf735dbfc8..b17378858c0 100644 --- a/Kernel_23/include/CGAL/Projection_traits_xy_3.h +++ b/Kernel_23/include/CGAL/Projection_traits_xy_3.h @@ -1,9 +1,10 @@ // Copyright (c) 1997-2010 INRIA Sophia-Antipolis (France). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org); you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public License as +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/Projection_traits_xz_3.h b/Kernel_23/include/CGAL/Projection_traits_xz_3.h index 08b1f9bef1c..f094e79fb7e 100644 --- a/Kernel_23/include/CGAL/Projection_traits_xz_3.h +++ b/Kernel_23/include/CGAL/Projection_traits_xz_3.h @@ -1,9 +1,10 @@ // Copyright (c) 1997-2010 INRIA Sophia-Antipolis (France). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org); you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public License as +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/Projection_traits_yz_3.h b/Kernel_23/include/CGAL/Projection_traits_yz_3.h index 1f3b1dec916..6ed672859a8 100644 --- a/Kernel_23/include/CGAL/Projection_traits_yz_3.h +++ b/Kernel_23/include/CGAL/Projection_traits_yz_3.h @@ -1,9 +1,10 @@ // Copyright (c) 1997-2010 INRIA Sophia-Antipolis (France). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org); you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public License as +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Kernel_23/include/CGAL/internal/Projection_traits_3.h b/Kernel_23/include/CGAL/internal/Projection_traits_3.h index 3bcde6c98d5..07e3e59ff77 100644 --- a/Kernel_23/include/CGAL/internal/Projection_traits_3.h +++ b/Kernel_23/include/CGAL/internal/Projection_traits_3.h @@ -1,9 +1,10 @@ // Copyright (c) 1997-2010 INRIA Sophia-Antipolis (France). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org); you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public License as +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Polynomial/include/CGAL/Polynomial/square_free_factorize.h b/Polynomial/include/CGAL/Polynomial/square_free_factorize.h index 021d058a4bd..64b17093236 100644 --- a/Polynomial/include/CGAL/Polynomial/square_free_factorize.h +++ b/Polynomial/include/CGAL/Polynomial/square_free_factorize.h @@ -1,9 +1,10 @@ // Copyright (c) 1997 INRIA Sophia-Antipolis (France). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org); you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public License as +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. From e59bf2d70d1f140a60f15007ab82869f4de169bc Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Tue, 11 Oct 2011 07:41:12 +0000 Subject: [PATCH 29/75] Export operator<< for ExprRep --- Core/include/CGAL/CORE/ExprRep.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/include/CGAL/CORE/ExprRep.h b/Core/include/CGAL/CORE/ExprRep.h index 7c6535ce55e..12ea43b9dd4 100644 --- a/Core/include/CGAL/CORE/ExprRep.h +++ b/Core/include/CGAL/CORE/ExprRep.h @@ -405,7 +405,7 @@ public: /// \name I/O Stream //@{ - friend std::ostream& operator<<(std::ostream&, ExprRep&); + CGAL_CORE_EXPORT friend std::ostream& operator<<(std::ostream&, ExprRep&); //@} private: From d0b7e5d94030ffadba4cdf9f95dbeef0413f415a Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Tue, 11 Oct 2011 07:42:43 +0000 Subject: [PATCH 30/75] disable warnings on extern before template instantiation --- Number_types/include/CGAL/MP_Float.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Number_types/include/CGAL/MP_Float.h b/Number_types/include/CGAL/MP_Float.h index b37025c4417..58469137723 100644 --- a/Number_types/include/CGAL/MP_Float.h +++ b/Number_types/include/CGAL/MP_Float.h @@ -133,10 +133,21 @@ MP_Float operator%(const MP_Float &a, const MP_Float &b); // We have to export the instantiated vector class // as it is used in inlined functions defined in the MP_Float.h file +//disable warnings on extern before template instantiation + +#if defined(BOOST_MSVC) +# pragma warning(push) +# pragma warning (disable : 4231) +#endif + // short == MP_Float::limb CGAL_EXPIMP_TEMPLATE template class CGAL_EXPORT std::allocator; CGAL_EXPIMP_TEMPLATE template class CGAL_EXPORT std::vector; +#if defined(BOOST_MSVC) +# pragma warning(pop) +#endif + namespace CGAL { // Reopen the namespace CGAL class CGAL_EXPORT MP_Float From 88ef561715497e47c467506ec498fd2b84e0f0c3 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Tue, 11 Oct 2011 09:51:29 +0000 Subject: [PATCH 31/75] Fix the call to Q_INIT_RESOURCE For resources that are shipped by the CGAL_Qt4 library, one need to call CGAL_QT4_INIT_RESOURCES, a macro that calls CGAL_Qt4_init_resources (exported by the CGAL_Qt4 DLL) --- AABB_tree/demo/AABB_tree/AABB_demo.cpp | 6 ++---- Alpha_shapes_3/demo/Alpha_shapes_3/Alpha_shape_3.cpp | 6 +++--- .../boolean_operations_2.cpp | 5 ++--- GraphicsView/demo/Alpha_shapes_2/Alpha_shapes_2.cpp | 6 ++---- .../demo/Apollonius_graph_2/Apollonius_graph_2.cpp | 5 ++--- GraphicsView/demo/Bounding_volumes/Bounding_volumes.cpp | 5 ++--- GraphicsView/demo/Circular_kernel_2/Circular_kernel_2.cpp | 5 ++--- GraphicsView/demo/Generator/Generator_2.cpp | 5 ++--- .../demo/L1_Voronoi_diagram_2/L1_voronoi_diagram_2.cpp | 7 ++----- .../Largest_empty_rect_2/Largest_empty_rectangle_2.cpp | 5 ++--- GraphicsView/demo/Polygon/Polygon_2.cpp | 5 ++--- .../demo/Segment_Delaunay_graph_2/Segment_voronoi_2.cpp | 6 ++---- GraphicsView/demo/Snap_rounding_2/Snap_rounding_2.cpp | 5 ++--- .../demo/Spatial_searching_2/Spatial_searching_2.cpp | 5 ++--- GraphicsView/demo/Stream_lines_2/Stream_lines_2.cpp | 5 ++--- .../Constrained_Delaunay_triangulation_2.cpp | 6 ++---- .../demo/Triangulation_2/Delaunay_triangulation_2.cpp | 6 ++---- .../demo/Triangulation_2/Regular_triangulation_2.cpp | 6 ++---- GraphicsView/include/CGAL/Qt/resources.h | 6 +++++- Mesh_3/demo/Mesh_3/Mesh_3.cpp | 6 ++---- .../demo/Periodic_Lloyd_3/Periodic_Lloyd_3.cpp | 5 +++-- Polyhedron/demo/Polyhedron/Polyhedron_3.cpp | 3 ++- .../demo/Principal_component_analysis/PCA_demo.cpp | 6 ++---- .../Surface_reconstruction_points_3/Point_set_demo.cpp | 6 ++---- 24 files changed, 53 insertions(+), 78 deletions(-) diff --git a/AABB_tree/demo/AABB_tree/AABB_demo.cpp b/AABB_tree/demo/AABB_tree/AABB_demo.cpp index ae42cf4ccbb..ff71e741738 100644 --- a/AABB_tree/demo/AABB_tree/AABB_demo.cpp +++ b/AABB_tree/demo/AABB_tree/AABB_demo.cpp @@ -24,6 +24,7 @@ #include "MainWindow.h" #include +#include int main(int argc, char **argv) { @@ -34,10 +35,7 @@ int main(int argc, char **argv) // Import resources from libCGALQt4. // See http://doc.trolltech.com/4.4/qdir.html#Q_INIT_RESOURCE - Q_INIT_RESOURCE(File); - Q_INIT_RESOURCE(Triangulation_2); - Q_INIT_RESOURCE(Input); - Q_INIT_RESOURCE(CGAL); + CGAL_QT4_INIT_RESOURCES; MainWindow mainWindow; mainWindow.show(); diff --git a/Alpha_shapes_3/demo/Alpha_shapes_3/Alpha_shape_3.cpp b/Alpha_shapes_3/demo/Alpha_shapes_3/Alpha_shape_3.cpp index b0c30008d8e..6f529d9534d 100644 --- a/Alpha_shapes_3/demo/Alpha_shapes_3/Alpha_shape_3.cpp +++ b/Alpha_shapes_3/demo/Alpha_shapes_3/Alpha_shape_3.cpp @@ -4,7 +4,7 @@ #include - +#include int main(int argc, char** argv) { @@ -16,9 +16,9 @@ int main(int argc, char** argv) // Import resources from libCGALQt4. // See http://doc.trolltech.com/4.4/qdir.html#Q_INIT_RESOURCE - Q_INIT_RESOURCE(File); + CGAL_QT4_INIT_RESOURCES; Q_INIT_RESOURCE(Alpha_shape_3); - Q_INIT_RESOURCE(CGAL); + MainWindow mw; mw.show(); diff --git a/Boolean_set_operations_2/demo/Boolean_set_operations_2_GraphicsView/boolean_operations_2.cpp b/Boolean_set_operations_2/demo/Boolean_set_operations_2_GraphicsView/boolean_operations_2.cpp index b345af1663f..2c50d349772 100644 --- a/Boolean_set_operations_2/demo/Boolean_set_operations_2_GraphicsView/boolean_operations_2.cpp +++ b/Boolean_set_operations_2/demo/Boolean_set_operations_2_GraphicsView/boolean_operations_2.cpp @@ -1618,6 +1618,7 @@ void MainWindow::zoomToFit() } #include "boolean_operations_2.moc" +#include int main(int argc, char **argv) { @@ -1629,9 +1630,7 @@ int main(int argc, char **argv) // Import resources from libCGALQt4. // See http://doc.trolltech.com/4.4/qdir.html#Q_INIT_RESOURCE - Q_INIT_RESOURCE(File); - Q_INIT_RESOURCE(Input); - Q_INIT_RESOURCE(CGAL); + CGAL_QT4_INIT_RESOURCES; MainWindow mainWindow; mainWindow.show(); diff --git a/GraphicsView/demo/Alpha_shapes_2/Alpha_shapes_2.cpp b/GraphicsView/demo/Alpha_shapes_2/Alpha_shapes_2.cpp index cecd25c67e2..850ab18a0a7 100644 --- a/GraphicsView/demo/Alpha_shapes_2/Alpha_shapes_2.cpp +++ b/GraphicsView/demo/Alpha_shapes_2/Alpha_shapes_2.cpp @@ -289,6 +289,7 @@ MainWindow::on_actionRecenter_triggered() #include "Alpha_shapes_2.moc" +#include int main(int argc, char **argv) { @@ -300,10 +301,7 @@ int main(int argc, char **argv) // Import resources from libCGALQt4. // See http://doc.trolltech.com/4.4/qdir.html#Q_INIT_RESOURCE - Q_INIT_RESOURCE(File); - Q_INIT_RESOURCE(Triangulation_2); - Q_INIT_RESOURCE(Input); - Q_INIT_RESOURCE(CGAL); + CGAL_QT4_INIT_RESOURCES; MainWindow mainWindow; mainWindow.show(); diff --git a/GraphicsView/demo/Apollonius_graph_2/Apollonius_graph_2.cpp b/GraphicsView/demo/Apollonius_graph_2/Apollonius_graph_2.cpp index c431b586d67..8c25f83e8d0 100644 --- a/GraphicsView/demo/Apollonius_graph_2/Apollonius_graph_2.cpp +++ b/GraphicsView/demo/Apollonius_graph_2/Apollonius_graph_2.cpp @@ -272,6 +272,7 @@ MainWindow::on_actionRecenter_triggered() #include "Apollonius_graph_2.moc" +#include int main(int argc, char **argv) { @@ -283,10 +284,8 @@ int main(int argc, char **argv) // Import resources from libCGALQt4. // See http://doc.trolltech.com/4.4/qdir.html#Q_INIT_RESOURCE - Q_INIT_RESOURCE(File); + CGAL_QT4_INIT_RESOURCES; Q_INIT_RESOURCE(Apollonius_graph_2); - Q_INIT_RESOURCE(Input); - Q_INIT_RESOURCE(CGAL); MainWindow mainWindow; mainWindow.show(); diff --git a/GraphicsView/demo/Bounding_volumes/Bounding_volumes.cpp b/GraphicsView/demo/Bounding_volumes/Bounding_volumes.cpp index 0715544362d..43bc4a78142 100644 --- a/GraphicsView/demo/Bounding_volumes/Bounding_volumes.cpp +++ b/GraphicsView/demo/Bounding_volumes/Bounding_volumes.cpp @@ -529,6 +529,7 @@ MainWindow::on_actionRecenter_triggered() #include "Bounding_volumes.moc" +#include int main(int argc, char **argv) { @@ -540,9 +541,7 @@ int main(int argc, char **argv) // Import resources from libCGALQt4. // See http://doc.trolltech.com/4.4/qdir.html#Q_INIT_RESOURCE - Q_INIT_RESOURCE(File); - Q_INIT_RESOURCE(Input); - Q_INIT_RESOURCE(CGAL); + CGAL_QT4_INIT_RESOURCES; MainWindow mainWindow; mainWindow.show(); diff --git a/GraphicsView/demo/Circular_kernel_2/Circular_kernel_2.cpp b/GraphicsView/demo/Circular_kernel_2/Circular_kernel_2.cpp index c31b8452c4c..38380d74073 100644 --- a/GraphicsView/demo/Circular_kernel_2/Circular_kernel_2.cpp +++ b/GraphicsView/demo/Circular_kernel_2/Circular_kernel_2.cpp @@ -278,6 +278,7 @@ MainWindow::on_actionRecenter_triggered() #include "Circular_kernel_2.moc" +#include int main(int argc, char **argv) { @@ -289,9 +290,7 @@ int main(int argc, char **argv) // Import resources from libCGALQt4. // See http://doc.trolltech.com/4.4/qdir.html#Q_INIT_RESOURCE - Q_INIT_RESOURCE(File); - Q_INIT_RESOURCE(Input); - Q_INIT_RESOURCE(CGAL); + CGAL_QT4_INIT_RESOURCES; MainWindow mainWindow; mainWindow.show(); diff --git a/GraphicsView/demo/Generator/Generator_2.cpp b/GraphicsView/demo/Generator/Generator_2.cpp index ea141cbb87e..6967251b788 100644 --- a/GraphicsView/demo/Generator/Generator_2.cpp +++ b/GraphicsView/demo/Generator/Generator_2.cpp @@ -271,6 +271,7 @@ MainWindow::clear() #include "Generator_2.moc" +#include int main(int argc, char **argv) { @@ -282,10 +283,8 @@ int main(int argc, char **argv) // Import resources from libCGALQt4. // See http://doc.trolltech.com/4.4/qdir.html#Q_INIT_RESOURCE - Q_INIT_RESOURCE(File); + CGAL_QT4_INIT_RESOURCES; Q_INIT_RESOURCE(Generator_2); - Q_INIT_RESOURCE(Input); - Q_INIT_RESOURCE(CGAL); MainWindow mainWindow; mainWindow.show(); diff --git a/GraphicsView/demo/L1_Voronoi_diagram_2/L1_voronoi_diagram_2.cpp b/GraphicsView/demo/L1_Voronoi_diagram_2/L1_voronoi_diagram_2.cpp index ac209c4bf79..58760e59ef9 100644 --- a/GraphicsView/demo/L1_Voronoi_diagram_2/L1_voronoi_diagram_2.cpp +++ b/GraphicsView/demo/L1_Voronoi_diagram_2/L1_voronoi_diagram_2.cpp @@ -374,6 +374,7 @@ MainWindow::bounding_rect() { #include "L1_voronoi_diagram_2.moc" +#include int main(int argc, char **argv) { @@ -385,11 +386,7 @@ int main(int argc, char **argv) // Import resources from libCGALQt4. // See http://doc.trolltech.com/4.4/qdir.html#Q_INIT_RESOURCE - Q_INIT_RESOURCE(File); - Q_INIT_RESOURCE(Triangulation_2); - Q_INIT_RESOURCE(Input); - Q_INIT_RESOURCE(CGAL); - + CGAL_QT4_INIT_RESOURCES; MainWindow mainWindow; mainWindow.show(); return app.exec(); diff --git a/GraphicsView/demo/Largest_empty_rect_2/Largest_empty_rectangle_2.cpp b/GraphicsView/demo/Largest_empty_rect_2/Largest_empty_rectangle_2.cpp index c0a28dd1dab..ce31af6689e 100644 --- a/GraphicsView/demo/Largest_empty_rect_2/Largest_empty_rectangle_2.cpp +++ b/GraphicsView/demo/Largest_empty_rect_2/Largest_empty_rectangle_2.cpp @@ -265,6 +265,7 @@ MainWindow::clear() #include "Largest_empty_rectangle_2.moc" +#include int main(int argc, char **argv) { @@ -276,10 +277,8 @@ int main(int argc, char **argv) // Import resources from libCGALQt4. // See http://doc.trolltech.com/4.4/qdir.html#Q_INIT_RESOURCE - Q_INIT_RESOURCE(File); + CGAL_QT4_INIT_RESOURCES; Q_INIT_RESOURCE(Largest_empty_rectangle_2); - Q_INIT_RESOURCE(Input); - Q_INIT_RESOURCE(CGAL); MainWindow mainWindow; mainWindow.show(); diff --git a/GraphicsView/demo/Polygon/Polygon_2.cpp b/GraphicsView/demo/Polygon/Polygon_2.cpp index d787de889a5..bd15c3ca827 100644 --- a/GraphicsView/demo/Polygon/Polygon_2.cpp +++ b/GraphicsView/demo/Polygon/Polygon_2.cpp @@ -553,6 +553,7 @@ MainWindow::clear() #include "Polygon_2.moc" +#include int main(int argc, char **argv) { @@ -564,10 +565,8 @@ int main(int argc, char **argv) // Import resources from libCGALQt4. // See http://doc.trolltech.com/4.4/qdir.html#Q_INIT_RESOURCE - Q_INIT_RESOURCE(File); + CGAL_QT4_INIT_RESOURCES; Q_INIT_RESOURCE(Polygon_2); - Q_INIT_RESOURCE(Input); - Q_INIT_RESOURCE(CGAL); MainWindow mainWindow; mainWindow.show(); diff --git a/GraphicsView/demo/Segment_Delaunay_graph_2/Segment_voronoi_2.cpp b/GraphicsView/demo/Segment_Delaunay_graph_2/Segment_voronoi_2.cpp index 1cc529b4227..5d7e8afa4db 100644 --- a/GraphicsView/demo/Segment_Delaunay_graph_2/Segment_voronoi_2.cpp +++ b/GraphicsView/demo/Segment_Delaunay_graph_2/Segment_voronoi_2.cpp @@ -365,6 +365,7 @@ MainWindow::saveConstraints(QString /*fileName*/) #include "Segment_voronoi_2.moc" +#include int main(int argc, char **argv) { @@ -376,10 +377,7 @@ int main(int argc, char **argv) // Import resources from libCGALQt4. // See http://doc.trolltech.com/4.4/qdir.html#Q_INIT_RESOURCE - Q_INIT_RESOURCE(File); - Q_INIT_RESOURCE(Triangulation_2); - Q_INIT_RESOURCE(Input); - Q_INIT_RESOURCE(CGAL); + CGAL_QT4_INIT_RESOURCES; MainWindow mainWindow; mainWindow.show(); diff --git a/GraphicsView/demo/Snap_rounding_2/Snap_rounding_2.cpp b/GraphicsView/demo/Snap_rounding_2/Snap_rounding_2.cpp index 0a4a2cd7371..587b876533c 100644 --- a/GraphicsView/demo/Snap_rounding_2/Snap_rounding_2.cpp +++ b/GraphicsView/demo/Snap_rounding_2/Snap_rounding_2.cpp @@ -296,6 +296,7 @@ MainWindow::on_actionRecenter_triggered() #include "Snap_rounding_2.moc" +#include int main(int argc, char **argv) { @@ -307,10 +308,8 @@ int main(int argc, char **argv) // Import resources from libCGALQt4. // See http://doc.trolltech.com/4.4/qdir.html#Q_INIT_RESOURCE - Q_INIT_RESOURCE(File); + CGAL_QT4_INIT_RESOURCES; Q_INIT_RESOURCE(Snap_rounding_2); - Q_INIT_RESOURCE(Input); - Q_INIT_RESOURCE(CGAL); MainWindow mainWindow; mainWindow.show(); diff --git a/GraphicsView/demo/Spatial_searching_2/Spatial_searching_2.cpp b/GraphicsView/demo/Spatial_searching_2/Spatial_searching_2.cpp index c98163b3c71..d75657bc467 100644 --- a/GraphicsView/demo/Spatial_searching_2/Spatial_searching_2.cpp +++ b/GraphicsView/demo/Spatial_searching_2/Spatial_searching_2.cpp @@ -278,6 +278,7 @@ MainWindow::clear() #include "Spatial_searching_2.moc" +#include int main(int argc, char **argv) { @@ -289,10 +290,8 @@ int main(int argc, char **argv) // Import resources from libCGALQt4. // See http://doc.trolltech.com/4.4/qdir.html#Q_INIT_RESOURCE - Q_INIT_RESOURCE(File); + CGAL_QT4_INIT_RESOURCES; Q_INIT_RESOURCE(Spatial_searching_2); - Q_INIT_RESOURCE(Input); - Q_INIT_RESOURCE(CGAL); MainWindow mainWindow; mainWindow.show(); diff --git a/GraphicsView/demo/Stream_lines_2/Stream_lines_2.cpp b/GraphicsView/demo/Stream_lines_2/Stream_lines_2.cpp index 8bf190901de..101165c245f 100644 --- a/GraphicsView/demo/Stream_lines_2/Stream_lines_2.cpp +++ b/GraphicsView/demo/Stream_lines_2/Stream_lines_2.cpp @@ -229,6 +229,7 @@ MainWindow::on_actionRecenter_triggered() #include "Stream_lines_2.moc" +#include int main(int argc, char **argv) { @@ -240,10 +241,8 @@ int main(int argc, char **argv) // Import resources from libCGALQt4. // See http://doc.trolltech.com/4.4/qdir.html#Q_INIT_RESOURCE - Q_INIT_RESOURCE(File); + CGAL_QT4_INIT_RESOURCES; Q_INIT_RESOURCE(Stream_lines_2); - Q_INIT_RESOURCE(Input); - Q_INIT_RESOURCE(CGAL); MainWindow mainWindow; mainWindow.show(); diff --git a/GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.cpp b/GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.cpp index 1390bd39b72..5e49792253c 100644 --- a/GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.cpp +++ b/GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.cpp @@ -712,6 +712,7 @@ MainWindow::on_actionInsertRandomPoints_triggered() } #include "Constrained_Delaunay_triangulation_2.moc" +#include int main(int argc, char **argv) { @@ -723,10 +724,7 @@ int main(int argc, char **argv) // Import resources from libCGALQt4. // See http://doc.trolltech.com/4.4/qdir.html#Q_INIT_RESOURCE - Q_INIT_RESOURCE(File); - Q_INIT_RESOURCE(Triangulation_2); - Q_INIT_RESOURCE(Input); - Q_INIT_RESOURCE(CGAL); + CGAL_QT4_INIT_RESOURCES; MainWindow mainWindow; mainWindow.show(); diff --git a/GraphicsView/demo/Triangulation_2/Delaunay_triangulation_2.cpp b/GraphicsView/demo/Triangulation_2/Delaunay_triangulation_2.cpp index 5ebda5f2dfd..29649bbd2be 100644 --- a/GraphicsView/demo/Triangulation_2/Delaunay_triangulation_2.cpp +++ b/GraphicsView/demo/Triangulation_2/Delaunay_triangulation_2.cpp @@ -370,6 +370,7 @@ MainWindow::on_actionRecenter_triggered() #include "Delaunay_triangulation_2.moc" +#include int main(int argc, char **argv) { @@ -381,10 +382,7 @@ int main(int argc, char **argv) // Import resources from libCGALQt4. // See http://doc.trolltech.com/4.4/qdir.html#Q_INIT_RESOURCE - Q_INIT_RESOURCE(File); - Q_INIT_RESOURCE(Triangulation_2); - Q_INIT_RESOURCE(Input); - Q_INIT_RESOURCE(CGAL); + CGAL_QT4_INIT_RESOURCES; MainWindow mainWindow; mainWindow.show(); diff --git a/GraphicsView/demo/Triangulation_2/Regular_triangulation_2.cpp b/GraphicsView/demo/Triangulation_2/Regular_triangulation_2.cpp index ae4d0383112..0a71dfd0539 100644 --- a/GraphicsView/demo/Triangulation_2/Regular_triangulation_2.cpp +++ b/GraphicsView/demo/Triangulation_2/Regular_triangulation_2.cpp @@ -285,6 +285,7 @@ MainWindow::on_actionRecenter_triggered() #include "Regular_triangulation_2.moc" +#include int main(int argc, char **argv) { @@ -296,10 +297,7 @@ int main(int argc, char **argv) // Import resources from libCGALQt4. // See http://doc.trolltech.com/4.4/qdir.html#Q_INIT_RESOURCE - Q_INIT_RESOURCE(File); - Q_INIT_RESOURCE(Triangulation_2); - Q_INIT_RESOURCE(Input); - Q_INIT_RESOURCE(CGAL); + CGAL_QT4_INIT_RESOURCES; MainWindow mainWindow; mainWindow.show(); diff --git a/GraphicsView/include/CGAL/Qt/resources.h b/GraphicsView/include/CGAL/Qt/resources.h index d01e622d1bf..95d7e574ff7 100644 --- a/GraphicsView/include/CGAL/Qt/resources.h +++ b/GraphicsView/include/CGAL/Qt/resources.h @@ -20,9 +20,13 @@ #ifndef CGAL_QT_RESOURCES_H #define CGAL_QT_RESOURCES_H +#include + // cannot use namespaces because of the Q_INIT_RESOURCE macro CGAL_QT4_EXPORT void CGAL_Qt4_init_resources(); -#define CGAL_QT4_INIT_RESOURCES CGAL_Qt4_init_resources(); +#define CGAL_QT4_INIT_RESOURCES do { CGAL_Qt4_init_resources(); } while(0) +// The do{}while(0) trick is used to make that macro value a regular +// statement and not a compound statement. #endif // CGAL_QT_RESOURCES_H diff --git a/Mesh_3/demo/Mesh_3/Mesh_3.cpp b/Mesh_3/demo/Mesh_3/Mesh_3.cpp index 91e18d7a1e1..89590e43ac0 100644 --- a/Mesh_3/demo/Mesh_3/Mesh_3.cpp +++ b/Mesh_3/demo/Mesh_3/Mesh_3.cpp @@ -1,5 +1,6 @@ #include "MainWindow.h" #include +#include int main(int argc, char **argv) { @@ -10,10 +11,7 @@ int main(int argc, char **argv) // Import resources from libCGALQt4. // See http://doc.trolltech.com/4.4/qdir.html#Q_INIT_RESOURCE - Q_INIT_RESOURCE(File); - Q_INIT_RESOURCE(Triangulation_2); - Q_INIT_RESOURCE(Input); - Q_INIT_RESOURCE(CGAL); + CGAL_QT4_INIT_RESOURCES; MainWindow mainWindow; mainWindow.show(); diff --git a/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/Periodic_Lloyd_3.cpp b/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/Periodic_Lloyd_3.cpp index e9d72ade7d0..3bd16d35fa9 100644 --- a/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/Periodic_Lloyd_3.cpp +++ b/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/Periodic_Lloyd_3.cpp @@ -1,5 +1,6 @@ #include "MainWindow.h" #include +#include int main(int argc, char** argv) { @@ -11,9 +12,9 @@ int main(int argc, char** argv) // Import resources from libCGALQt4. // See http://doc.trolltech.com/4.4/qdir.html#Q_INIT_RESOURCE - Q_INIT_RESOURCE(File); + CGAL_QT4_INIT_RESOURCES; Q_INIT_RESOURCE(Periodic_Lloyd_3); - Q_INIT_RESOURCE(CGAL); + MainWindow mw; mw.show(); diff --git a/Polyhedron/demo/Polyhedron/Polyhedron_3.cpp b/Polyhedron/demo/Polyhedron/Polyhedron_3.cpp index c41f2246920..623db9777dd 100644 --- a/Polyhedron/demo/Polyhedron/Polyhedron_3.cpp +++ b/Polyhedron/demo/Polyhedron/Polyhedron_3.cpp @@ -1,5 +1,6 @@ #include "MainWindow.h" #include +#include int main(int argc, char **argv) { @@ -10,7 +11,7 @@ int main(int argc, char **argv) // Import resources from libCGALQt4. // See http://doc.trolltech.com/4.4/qdir.html#Q_INIT_RESOURCE - CGAL_QT4_INIT_RESOURCES + CGAL_QT4_INIT_RESOURCES; MainWindow mainWindow; mainWindow.show(); diff --git a/Principal_component_analysis/demo/Principal_component_analysis/PCA_demo.cpp b/Principal_component_analysis/demo/Principal_component_analysis/PCA_demo.cpp index 131f9c297a2..b6d6014b6bd 100644 --- a/Principal_component_analysis/demo/Principal_component_analysis/PCA_demo.cpp +++ b/Principal_component_analysis/demo/Principal_component_analysis/PCA_demo.cpp @@ -24,6 +24,7 @@ #include "MainWindow.h" #include +#include int main(int argc, char **argv) { @@ -34,10 +35,7 @@ int main(int argc, char **argv) // Import resources from libCGALQt4. // See http://doc.trolltech.com/4.4/qdir.html#Q_INIT_RESOURCE - Q_INIT_RESOURCE(File); - Q_INIT_RESOURCE(Triangulation_2); - Q_INIT_RESOURCE(Input); - Q_INIT_RESOURCE(CGAL); + CGAL_QT4_INIT_RESOURCES; MainWindow mainWindow; mainWindow.show(); diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo.cpp b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo.cpp index 2a12e7acece..0244170d3da 100644 --- a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo.cpp +++ b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo.cpp @@ -1,5 +1,6 @@ #include "MainWindow.h" #include +#include int main(int argc, char **argv) { @@ -10,10 +11,7 @@ int main(int argc, char **argv) // Import resources from libCGALQt4. // See http://doc.trolltech.com/4.4/qdir.html#Q_INIT_RESOURCE - Q_INIT_RESOURCE(File); - Q_INIT_RESOURCE(Triangulation_2); - Q_INIT_RESOURCE(Input); - Q_INIT_RESOURCE(CGAL); + CGAL_QT4_INIT_RESOURCES; MainWindow mainWindow; mainWindow.show(); From a1bc5ab47b517b469a78b873a4037f5cc43de849 Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Tue, 11 Oct 2011 10:59:30 +0000 Subject: [PATCH 32/75] Move MP_Float.cpp to a header MP_Float_impl.h Having MP_Float.cpp in the CGAL library exposes the ABI of the STL container std::vector. That is not recommended because the ABI of the STL depends on compilation flags (debug, thread-safe, etc.) --- Number_types/include/CGAL/MP_Float.h | 47 +--------- .../CGAL/MP_Float_impl.h} | 92 ++++++++++++------- 2 files changed, 62 insertions(+), 77 deletions(-) rename Number_types/{src/CGAL/MP_Float.cpp => include/CGAL/MP_Float_impl.h} (82%) diff --git a/Number_types/include/CGAL/MP_Float.h b/Number_types/include/CGAL/MP_Float.h index 58469137723..b38805fb186 100644 --- a/Number_types/include/CGAL/MP_Float.h +++ b/Number_types/include/CGAL/MP_Float.h @@ -66,91 +66,54 @@ template < typename > class Quotient; // Needed for overloaded To_double namespace INTERN_MP_FLOAT { -CGAL_EXPORT Comparison_result compare(const MP_Float&, const MP_Float&); -CGAL_EXPORT MP_Float square(const MP_Float&); // to_double() returns, not the closest double, but a one bit error is allowed. // We guarantee : to_double(MP_Float(double d)) == d. -CGAL_EXPORT + double to_double(const MP_Float&); -CGAL_EXPORT + double to_double(const Quotient&); -CGAL_EXPORT std::pair to_interval(const MP_Float &); -CGAL_EXPORT std::pair to_interval(const Quotient&); -CGAL_EXPORT MP_Float div(const MP_Float& n1, const MP_Float& n2); -CGAL_EXPORT MP_Float gcd(const MP_Float& a, const MP_Float& b); } //namespace INTERN_MP_FLOAT -CGAL_EXPORT std::pair to_double_exp(const MP_Float &b); // Returns (first * 2^second), an interval surrounding b. -CGAL_EXPORT std::pair, int> to_interval_exp(const MP_Float &b); -CGAL_EXPORT std::ostream & operator<< (std::ostream & os, const MP_Float &b); // This one is for debug. -CGAL_EXPORT std::ostream & print (std::ostream & os, const MP_Float &b); -CGAL_EXPORT std::istream & operator>> (std::istream & is, MP_Float &b); -CGAL_EXPORT MP_Float operator+(const MP_Float &a, const MP_Float &b); -CGAL_EXPORT MP_Float operator-(const MP_Float &a, const MP_Float &b); -CGAL_EXPORT MP_Float operator*(const MP_Float &a, const MP_Float &b); -CGAL_EXPORT MP_Float operator%(const MP_Float &a, const MP_Float &b); -} // Close the CGAL namespace for the following explicit instantiation of - // std:: template classes. -// We have to export the instantiated vector class -// as it is used in inlined functions defined in the MP_Float.h file - -//disable warnings on extern before template instantiation - -#if defined(BOOST_MSVC) -# pragma warning(push) -# pragma warning (disable : 4231) -#endif - -// short == MP_Float::limb -CGAL_EXPIMP_TEMPLATE template class CGAL_EXPORT std::allocator; -CGAL_EXPIMP_TEMPLATE template class CGAL_EXPORT std::vector; - -#if defined(BOOST_MSVC) -# pragma warning(pop) -#endif - -namespace CGAL { // Reopen the namespace CGAL - -class CGAL_EXPORT MP_Float +class MP_Float { public: typedef short limb; @@ -434,11 +397,9 @@ inline bool operator!=(const MP_Float &a, const MP_Float &b) { return ! (a == b); } -CGAL_EXPORT MP_Float approximate_sqrt(const MP_Float &d); -CGAL_EXPORT MP_Float approximate_division(const MP_Float &n, const MP_Float &d); @@ -921,6 +882,8 @@ CGAL_DEFINE_COERCION_TRAITS_FROM_TO(int, MP_Float) } //namespace CGAL +#include + //specialization for Get_arithmetic_kernel #include diff --git a/Number_types/src/CGAL/MP_Float.cpp b/Number_types/include/CGAL/MP_Float_impl.h similarity index 82% rename from Number_types/src/CGAL/MP_Float.cpp rename to Number_types/include/CGAL/MP_Float_impl.h index 05a66554639..1546d576835 100644 --- a/Number_types/src/CGAL/MP_Float.cpp +++ b/Number_types/include/CGAL/MP_Float_impl.h @@ -1,3 +1,4 @@ + // Copyright (c) 2001-2006 INRIA Sophia-Antipolis (France). // All rights reserved. // @@ -19,28 +20,25 @@ // Author(s) : Sylvain Pion #include -#include #include #include #include namespace CGAL { -using std::pair; - -typedef MP_Float::exponent_type exponent_type; - +namespace INTERN_MP_FLOAT { const unsigned log_limb = 8 * sizeof(MP_Float::limb); const MP_Float::limb2 base = 1 << log_limb; const MP_Float::V::size_type limbs_per_double = 2 + 53/log_limb; const double trunc_max = double(base)*(base/2-1)/double(base-1); const double trunc_min = double(-base)*(base/2)/double(base-1); - +} // namespace INTERN_MP_FLOAT // We face portability issues with the ISO C99 functions "nearbyint", // so I re-implement it for my need. template < typename T > +inline int my_nearbyint(const T& d) { int z = int(d); @@ -79,14 +77,14 @@ void MP_Float::construct_from_builtin_fp_type(T d) // First, scale d, and adjust exp accordingly. exp = 0; - while (d < trunc_min || d > trunc_max) { + while (d < INTERN_MP_FLOAT::trunc_min || d > INTERN_MP_FLOAT::trunc_max) { ++exp; - d /= base; + d /= INTERN_MP_FLOAT::base; } - while (d >= trunc_min/base && d <= trunc_max/base) { + while (d >= INTERN_MP_FLOAT::trunc_min/ INTERN_MP_FLOAT::base && d <= INTERN_MP_FLOAT::trunc_max/ INTERN_MP_FLOAT::base) { --exp; - d *= base; + d *= INTERN_MP_FLOAT::base; } // Then, compute the limbs. @@ -94,7 +92,7 @@ void MP_Float::construct_from_builtin_fp_type(T d) T orig = d, sum = 0; while (true) { int r = my_nearbyint(d); - if (d-r >= T(base/2-1)/(base-1)) + if (d-r >= T( INTERN_MP_FLOAT::base/2-1)/( INTERN_MP_FLOAT::base-1)) ++r; v.push_back(r); // We used to do simply "d -= v.back();", but when the most significant @@ -105,9 +103,9 @@ void MP_Float::construct_from_builtin_fp_type(T d) d = orig-sum; if (d == 0) break; - sum *= base; - orig *= base; - d *= base; + sum *= INTERN_MP_FLOAT::base; + orig *= INTERN_MP_FLOAT::base; + d *= INTERN_MP_FLOAT::base; --exp; } @@ -117,27 +115,32 @@ void MP_Float::construct_from_builtin_fp_type(T d) CGAL_assertion(v.back() != 0); } +inline MP_Float::MP_Float(float d) { construct_from_builtin_fp_type(d); CGAL_expensive_assertion(CGAL::to_double(*this) == d); } +inline MP_Float::MP_Float(double d) { construct_from_builtin_fp_type(d); CGAL_expensive_assertion(CGAL::to_double(*this) == d); } +inline MP_Float::MP_Float(long double d) { construct_from_builtin_fp_type(d); // CGAL_expensive_assertion(CGAL::to_double(*this) == d); } +inline Comparison_result INTERN_MP_FLOAT::compare (const MP_Float & a, const MP_Float & b) { + typedef MP_Float::exponent_type exponent_type; if (a.is_zero()) return (Comparison_result) - b.sign(); if (b.is_zero()) @@ -160,6 +163,7 @@ inline MP_Float Add_Sub(const MP_Float &a, const MP_Float &b, const BinOp &op) { + typedef MP_Float::exponent_type exponent_type; CGAL_assertion(!b.is_zero()); exponent_type min_exp, max_exp; @@ -187,6 +191,7 @@ Add_Sub(const MP_Float &a, const MP_Float &b, const BinOp &op) return r; } +inline MP_Float operator+(const MP_Float &a, const MP_Float &b) { @@ -198,6 +203,7 @@ operator+(const MP_Float &a, const MP_Float &b) return Add_Sub(a, b, std::plus()); } +inline MP_Float operator-(const MP_Float &a, const MP_Float &b) { @@ -207,6 +213,7 @@ operator-(const MP_Float &a, const MP_Float &b) return Add_Sub(a, b, std::minus()); } +inline MP_Float operator*(const MP_Float &a, const MP_Float &b) { @@ -239,6 +246,7 @@ operator*(const MP_Float &a, const MP_Float &b) } // Squaring simplifies things and is faster, so we specialize it. +inline MP_Float INTERN_MP_FLOAT::square(const MP_Float &a) { @@ -317,6 +325,7 @@ Integer reciprocal(const Integer A, Integer k) { } */ +inline MP_Float approximate_division(const MP_Float &a, const MP_Float &b) { @@ -324,6 +333,7 @@ approximate_division(const MP_Float &a, const MP_Float &b) return MP_Float(CGAL::to_double(a)/CGAL::to_double(b)); } +inline MP_Float approximate_sqrt(const MP_Float &d) { @@ -331,15 +341,17 @@ approximate_sqrt(const MP_Float &d) } // Returns (first * 2^second), an approximation of b. -pair +inline +std::pair to_double_exp(const MP_Float &b) { + typedef MP_Float::exponent_type exponent_type; if (b.is_zero()) return std::make_pair(0.0, 0); exponent_type exp = b.max_exp(); - int steps = static_cast((std::min)(limbs_per_double, b.v.size())); - double d_exp_1 = std::ldexp(1.0, - static_cast(log_limb)); + int steps = static_cast((std::min)( INTERN_MP_FLOAT::limbs_per_double, b.v.size())); + double d_exp_1 = std::ldexp(1.0, - static_cast( INTERN_MP_FLOAT::log_limb)); double d_exp = 1.0; double d = 0; @@ -348,22 +360,24 @@ to_double_exp(const MP_Float &b) d += d_exp * b.of_exp(i); } - CGAL_assertion_msg(CGAL::abs(exp*log_limb) < (1<<30)*2.0, + CGAL_assertion_msg(CGAL::abs(exp* INTERN_MP_FLOAT::log_limb) < (1<<30)*2.0, "Exponent overflow in MP_Float to_double"); - return std::make_pair(d, static_cast(exp * log_limb)); + return std::make_pair(d, static_cast(exp * INTERN_MP_FLOAT::log_limb)); } // Returns (first * 2^second), an interval surrounding b. -pair, int> +inline +std::pair, int> to_interval_exp(const MP_Float &b) { + typedef MP_Float::exponent_type exponent_type; if (b.is_zero()) - return std::make_pair(pair(0, 0), 0); + return std::make_pair(std::pair(0, 0), 0); exponent_type exp = b.max_exp(); - int steps = static_cast((std::min)(limbs_per_double, b.v.size())); - double d_exp_1 = std::ldexp(1.0, - (int) log_limb); + int steps = static_cast((std::min)( INTERN_MP_FLOAT::limbs_per_double, b.v.size())); + double d_exp_1 = std::ldexp(1.0, - (int) INTERN_MP_FLOAT::log_limb); double d_exp = 1.0; Interval_nt_advanced::Protector P; @@ -393,49 +407,54 @@ to_interval_exp(const MP_Float &b) CGAL_assertion(MP_Float(d.inf()) <= b & MP_Float(d.sup()) >= b); #endif - CGAL_assertion_msg(CGAL::abs(exp*log_limb) < (1<<30)*2.0, + CGAL_assertion_msg(CGAL::abs(exp* INTERN_MP_FLOAT::log_limb) < (1<<30)*2.0, "Exponent overflow in MP_Float to_interval"); - return std::make_pair(d.pair(), static_cast(exp * log_limb)); + return std::make_pair(d.pair(), static_cast(exp * INTERN_MP_FLOAT::log_limb)); } // to_double() returns, not the closest double, but a one bit error is allowed. // We guarantee : to_double(MP_Float(double d)) == d. +inline double INTERN_MP_FLOAT::to_double(const MP_Float &b) { - pair ap = to_double_exp(b); + std::pair ap = to_double_exp(b); return ap.first * std::ldexp(1.0, ap.second); } +inline double INTERN_MP_FLOAT::to_double(const Quotient &q) { - pair n = to_double_exp(q.numerator()); - pair d = to_double_exp(q.denominator()); + std::pair n = to_double_exp(q.numerator()); + std::pair d = to_double_exp(q.denominator()); double scale = std::ldexp(1.0, n.second - d.second); return (n.first / d.first) * scale; } // FIXME : This function deserves proper testing... -pair +inline +std::pair INTERN_MP_FLOAT::to_interval(const MP_Float &b) { - pair, int> ap = to_interval_exp(b); + std::pair, int> ap = to_interval_exp(b); return ldexp(Interval_nt<>(ap.first), ap.second).pair(); } // FIXME : This function deserves proper testing... -pair +inline +std::pair INTERN_MP_FLOAT::to_interval(const Quotient &q) { - pair, int> n = to_interval_exp(q.numerator()); - pair, int> d = to_interval_exp(q.denominator()); + std::pair, int> n = to_interval_exp(q.numerator()); + std::pair, int> d = to_interval_exp(q.denominator()); CGAL_assertion_msg(CGAL::abs(1.0*n.second - d.second) < (1<<30)*2.0, "Exponent overflow in Quotient to_interval"); return ldexp(Interval_nt<>(n.first) / Interval_nt<>(d.first), n.second - d.second).pair(); } +inline std::ostream & operator<< (std::ostream & os, const MP_Float &b) { @@ -443,15 +462,17 @@ operator<< (std::ostream & os, const MP_Float &b) return os; } +inline std::ostream & print (std::ostream & os, const MP_Float &b) { + typedef MP_Float::exponent_type exponent_type; // Binary format would be nice and not hard to have too (useful ?). if (b.is_zero()) return os << 0 << " [ double approx == " << 0.0 << " ]"; MP_Float::const_iterator i; - exponent_type exp = b.min_exp() * log_limb; + exponent_type exp = b.min_exp() * INTERN_MP_FLOAT::log_limb; double approx = 0; // only for giving an idea. for (i = b.v.begin(); i != b.v.end(); i++) @@ -464,7 +485,7 @@ print (std::ostream & os, const MP_Float &b) approx += std::ldexp(static_cast(*i), static_cast(exp)); - exp += log_limb; + exp += INTERN_MP_FLOAT::log_limb; } os << " [ double approx == " << approx << " ]"; @@ -472,6 +493,7 @@ print (std::ostream & os, const MP_Float &b) return os; } +inline std::istream & operator>> (std::istream & is, MP_Float &b) { From 87148361ffbf9181535762d08b23a1b15f2697d5 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Tue, 11 Oct 2011 13:52:25 +0000 Subject: [PATCH 33/75] Rename CGAL_BUILD_SHARED_LIB to CGAL_BUILD_SHARED_LIBS Better name, and more coherent with CMake variable name: BUILD_SHARED_LIBS --- CGALimageIO/include/CGAL/ImageIO/export.h | 2 +- Core/include/CGAL/CORE/export.h | 2 +- GraphicsView/include/CGAL/Qt/export.h | 2 +- Installation/CMakeLists.txt | 2 +- Installation/cmake/modules/CGAL_Common.cmake | 4 ++-- Installation/include/CGAL/export.h | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CGALimageIO/include/CGAL/ImageIO/export.h b/CGALimageIO/include/CGAL/ImageIO/export.h index c9f4667691b..8652275baac 100755 --- a/CGALimageIO/include/CGAL/ImageIO/export.h +++ b/CGALimageIO/include/CGAL/ImageIO/export.h @@ -22,7 +22,7 @@ #include -#if defined(BOOST_MSVC) && defined(CGAL_BUILD_SHARED_LIB) +#if defined(BOOST_MSVC) && defined(CGAL_BUILD_SHARED_LIBS) #if defined(CGAL_ImageIO_EXPORTS) // add by CMake or in cpp files of the dll #define CGAL_IMAGEIO_EXPORT __declspec (dllexport) diff --git a/Core/include/CGAL/CORE/export.h b/Core/include/CGAL/CORE/export.h index ea7e00dccaa..557115030cc 100755 --- a/Core/include/CGAL/CORE/export.h +++ b/Core/include/CGAL/CORE/export.h @@ -42,7 +42,7 @@ #include -#if defined(BOOST_MSVC) && ( ! defined(CGAL_EXPORTS) ) && defined(CGAL_BUILD_SHARED_LIB) +#if defined(BOOST_MSVC) && ( ! defined(CGAL_EXPORTS) ) && defined(CGAL_BUILD_SHARED_LIBS) #if defined(CGAL_Core_EXPORTS) // add by CMake or in cpp files of the dll #define CGAL_CORE_EXPORT __declspec (dllexport) diff --git a/GraphicsView/include/CGAL/Qt/export.h b/GraphicsView/include/CGAL/Qt/export.h index 58cc1993747..9858913f634 100755 --- a/GraphicsView/include/CGAL/Qt/export.h +++ b/GraphicsView/include/CGAL/Qt/export.h @@ -22,7 +22,7 @@ #include #include -#if defined(BOOST_MSVC) && defined(CGAL_BUILD_SHARED_LIB) +#if defined(BOOST_MSVC) && defined(CGAL_BUILD_SHARED_LIBS) #if defined(CGAL_Qt4_EXPORTS) // add by CMake or in cpp files of the dll #define CGAL_QT4_EXPORT __declspec (dllexport) diff --git a/Installation/CMakeLists.txt b/Installation/CMakeLists.txt index 803a31d6d6c..9ccb932eed6 100644 --- a/Installation/CMakeLists.txt +++ b/Installation/CMakeLists.txt @@ -483,7 +483,7 @@ add_config_flag( CGAL_USE_LEDA ) add_config_flag( CGAL_USE_MPFI ) add_config_flag( CGAL_USE_RS ) add_config_flag( CGAL_USE_NTL ) -add_config_flag( CGAL_BUILD_SHARED_LIB ) +add_config_flag( CGAL_BUILD_SHARED_LIBS ) set(CGAL_USE_CORE ${CGAL_USE_GMP}) diff --git a/Installation/cmake/modules/CGAL_Common.cmake b/Installation/cmake/modules/CGAL_Common.cmake index e6a9672047e..2cfd662b9c2 100644 --- a/Installation/cmake/modules/CGAL_Common.cmake +++ b/Installation/cmake/modules/CGAL_Common.cmake @@ -30,7 +30,7 @@ if( NOT CGAL_COMMON_FILE_INCLUDED ) endif() option(BUILD_SHARED_LIBS "Build shared libraries" ON) - set(CGAL_BUILD_SHARED_LIB ${BUILD_SHARED_LIBS}) + set(CGAL_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS}) if ( CGAL_BUILDING_LIBS ) if ( BUILD_SHARED_LIBS ) @@ -54,4 +54,4 @@ if( NOT CGAL_COMMON_FILE_INCLUDED ) set(CMAKE_COLORMAKEFILE ON) -endif() \ No newline at end of file +endif() diff --git a/Installation/include/CGAL/export.h b/Installation/include/CGAL/export.h index cee06d9e20f..ebdc2ce63e2 100755 --- a/Installation/include/CGAL/export.h +++ b/Installation/include/CGAL/export.h @@ -22,7 +22,7 @@ #include -#if defined(BOOST_MSVC) && defined(CGAL_BUILD_SHARED_LIB) +#if defined(BOOST_MSVC) && defined(CGAL_BUILD_SHARED_LIBS) #if defined(CGAL_EXPORTS) // add by CMake or in cpp files of the dll #define CGAL_EXPORT __declspec (dllexport) From 2ceafafab929cafd480d63e49b12f6917e00e44b Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Tue, 11 Oct 2011 14:24:22 +0000 Subject: [PATCH 34/75] Cleanup in the CMake variable CGAL*SHARED_LIB* Previously there was a variable CGAL_SHARED_LIBS defined by CGALConfig.cmake. This one is now unified with CGAL_BUILD_SHARED_LIBS. And the option CGAL_BUILD_SHARED_LIBS is only defined as an option if one are building CGAL libraries. If CGAL_Common.cmake is included from another project, such as from UseCGAL.cmake, then this variable is set in CGALConfig.cmake as a regular (non-cached) CMake variable. --- Installation/cmake/modules/CGALConfig_binary.cmake.in | 2 +- Installation/cmake/modules/CGALConfig_install.cmake.in | 2 +- Installation/cmake/modules/CGAL_Common.cmake | 6 +++--- Installation/cmake/modules/CGAL_SetupFlags.cmake | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Installation/cmake/modules/CGALConfig_binary.cmake.in b/Installation/cmake/modules/CGALConfig_binary.cmake.in index ac6f6725760..7039b0d1ffa 100644 --- a/Installation/cmake/modules/CGALConfig_binary.cmake.in +++ b/Installation/cmake/modules/CGALConfig_binary.cmake.in @@ -15,7 +15,7 @@ set(CGAL_MAJOR_VERSION "@CGAL_MAJOR_VERSION@" ) set(CGAL_MINOR_VERSION "@CGAL_MINOR_VERSION@" ) set(CGAL_BUILD_VERSION "@CGAL_BUILD_VERSION@" ) -set(CGAL_SHARED_LIBS "@BUILD_SHARED_LIBS@" ) +set(CGAL_BUILD_SHARED_LIBS "@CGAL_BUILD_SHARED_LIBS@" ) set(CGAL_CXX_FLAGS_INIT "@CMAKE_CXX_FLAGS@" ) set(CGAL_CXX_FLAGS_RELEASE_INIT "@CMAKE_CXX_FLAGS_RELEASE@" ) diff --git a/Installation/cmake/modules/CGALConfig_install.cmake.in b/Installation/cmake/modules/CGALConfig_install.cmake.in index 3af0640db87..4a77f200642 100644 --- a/Installation/cmake/modules/CGALConfig_install.cmake.in +++ b/Installation/cmake/modules/CGALConfig_install.cmake.in @@ -15,7 +15,7 @@ set(CGAL_MAJOR_VERSION "@CGAL_MAJOR_VERSION@" ) set(CGAL_MINOR_VERSION "@CGAL_MINOR_VERSION@" ) set(CGAL_BUILD_VERSION "@CGAL_BUILD_VERSION@" ) -set(CGAL_SHARED_LIBS "@BUILD_SHARED_LIBS@" ) +set(CGAL_BUILD_SHARED_LIBS "@CGAL_BUILD_SHARED_LIBS@" ) set(CGAL_CXX_FLAGS_INIT "@CMAKE_CXX_FLAGS@" ) set(CGAL_CXX_FLAGS_RELEASE_INIT "@CMAKE_CXX_FLAGS_RELEASE@" ) diff --git a/Installation/cmake/modules/CGAL_Common.cmake b/Installation/cmake/modules/CGAL_Common.cmake index 2cfd662b9c2..25cdf3b97be 100644 --- a/Installation/cmake/modules/CGAL_Common.cmake +++ b/Installation/cmake/modules/CGAL_Common.cmake @@ -29,10 +29,10 @@ if( NOT CGAL_COMMON_FILE_INCLUDED ) set( CMAKE_2_6_3_OR_ABOVE FALSE ) endif() - option(BUILD_SHARED_LIBS "Build shared libraries" ON) - set(CGAL_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS}) - if ( CGAL_BUILDING_LIBS ) + option(BUILD_SHARED_LIBS "Build shared libraries" ON) + set(CGAL_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS}) + if ( BUILD_SHARED_LIBS ) message( STATUS "Building shared libraries" ) else() diff --git a/Installation/cmake/modules/CGAL_SetupFlags.cmake b/Installation/cmake/modules/CGAL_SetupFlags.cmake index ad1306f9a3a..88798bba88f 100644 --- a/Installation/cmake/modules/CGAL_SetupFlags.cmake +++ b/Installation/cmake/modules/CGAL_SetupFlags.cmake @@ -20,7 +20,7 @@ if ( CGAL_CONFIG_LOADED AND NOT CGAL_DONT_OVERRIDE_CMAKE_FLAGS ) string( TOUPPER "${CMAKE_BUILD_TYPE}" CGAL_BUILD_TYPE_UPPER ) - if ( CGAL_SHARED_LIBS ) + if ( CGAL_BUILD_SHARED_LIBS ) set( CGAL_LINKER_FLAGS_TYPE SHARED ) else() set( CGAL_LINKER_FLAGS_TYPE MODULE ) From 9beade14e52900782ff355d0e9bfde088a96eb12 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Tue, 11 Oct 2011 16:49:05 +0000 Subject: [PATCH 35/75] Modify the documentation: document CGAL_BUILD_SHARED_LIBS --- Installation/doc_tex/Installation/installation.tex | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Installation/doc_tex/Installation/installation.tex b/Installation/doc_tex/Installation/installation.tex index 12e4467f145..8a8bd08cfbd 100644 --- a/Installation/doc_tex/Installation/installation.tex +++ b/Installation/doc_tex/Installation/installation.tex @@ -555,11 +555,11 @@ This is not an issue for solution/project files, as there the user selects the b \subsection{Static vs.\ Dynamic Libraries } -Under Windows we only support the static versions of the \cgal\ libraries.On other platforms -the shared version ({\tt .so}) are build by default. -You can choose to produce static libraries instead by setting the \cmake\ variable {\tt BUILD\_SHARED\_LIBS=FALSE} - -These setting affect the variants of third-party libraries selected whenever the choice is available. +Shared libraries ({\tt .dll} on Windows, {\tt .so} on Linux, {\tt .dylib} +on MacOS) are build by default. You can choose to produce static libraries +instead by setting the \cmake\ variable +{\tt CGAL\_BUILD\_SHARED\_LIBS=FALSE}. If you use \texttt{cmake-gui}, that +variable appears as a checkable option in the graphical interface. \subsection{Multiple Variants of makefiles}\label{sec:cmake-out-of-source} From 90c83ef68be28ef67d026e0070d373e55c57143b Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Tue, 11 Oct 2011 20:20:22 +0000 Subject: [PATCH 36/75] fixed typo --- Installation/doc_tex/Installation/installation.tex | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Installation/doc_tex/Installation/installation.tex b/Installation/doc_tex/Installation/installation.tex index 8a8bd08cfbd..ef2049d2521 100644 --- a/Installation/doc_tex/Installation/installation.tex +++ b/Installation/doc_tex/Installation/installation.tex @@ -556,10 +556,10 @@ This is not an issue for solution/project files, as there the user selects the b \subsection{Static vs.\ Dynamic Libraries } Shared libraries ({\tt .dll} on Windows, {\tt .so} on Linux, {\tt .dylib} -on MacOS) are build by default. You can choose to produce static libraries +on MacOS) are built by default. You can choose to produce static libraries instead by setting the \cmake\ variable {\tt CGAL\_BUILD\_SHARED\_LIBS=FALSE}. If you use \texttt{cmake-gui}, that -variable appears as a checkable option in the graphical interface. +variable appears as a checkable option in the graphical user interface. \subsection{Multiple Variants of makefiles}\label{sec:cmake-out-of-source} From dfba14f23c6e2b194e7194f572c828cca89d10f0 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Wed, 12 Oct 2011 09:43:19 +0000 Subject: [PATCH 37/75] Rename to --- CGALimageIO/include/CGAL/ImageIO.h | 2 +- .../include/CGAL/{ImageIO/export.h => export/ImageIO.h} | 0 Core/include/CGAL/CORE/Config.h | 2 +- Core/include/CGAL/{CORE/export.h => export/CORE.h} | 0 GraphicsView/include/CGAL/Qt/DemosMainWindow.h | 2 +- GraphicsView/include/CGAL/Qt/GraphicsViewNavigation.h | 2 +- GraphicsView/include/CGAL/Qt/GraphicsViewPolylineInput.h | 2 +- GraphicsView/include/CGAL/Qt/debug.h | 2 +- GraphicsView/include/CGAL/Qt/resources.h | 2 +- GraphicsView/include/CGAL/Qt/utility.h | 2 +- GraphicsView/include/CGAL/{Qt/export.h => export/Qt4.h} | 0 Installation/include/CGAL/config.h | 6 +++++- Installation/include/CGAL/{export.h => export/CGAL.h} | 0 13 files changed, 13 insertions(+), 9 deletions(-) rename CGALimageIO/include/CGAL/{ImageIO/export.h => export/ImageIO.h} (100%) rename Core/include/CGAL/{CORE/export.h => export/CORE.h} (100%) rename GraphicsView/include/CGAL/{Qt/export.h => export/Qt4.h} (100%) rename Installation/include/CGAL/{export.h => export/CGAL.h} (100%) diff --git a/CGALimageIO/include/CGAL/ImageIO.h b/CGALimageIO/include/CGAL/ImageIO.h index 7aaa654fba8..8ef046965ba 100644 --- a/CGALimageIO/include/CGAL/ImageIO.h +++ b/CGALimageIO/include/CGAL/ImageIO.h @@ -21,7 +21,7 @@ #define IMAGEIO_H #include -#include +#include #include diff --git a/CGALimageIO/include/CGAL/ImageIO/export.h b/CGALimageIO/include/CGAL/export/ImageIO.h similarity index 100% rename from CGALimageIO/include/CGAL/ImageIO/export.h rename to CGALimageIO/include/CGAL/export/ImageIO.h diff --git a/Core/include/CGAL/CORE/Config.h b/Core/include/CGAL/CORE/Config.h index 255d37835f6..f348ba4f614 100644 --- a/Core/include/CGAL/CORE/Config.h +++ b/Core/include/CGAL/CORE/Config.h @@ -17,6 +17,6 @@ #include #include -#include +#include #endif // _CORE_CONFIG_H_ diff --git a/Core/include/CGAL/CORE/export.h b/Core/include/CGAL/export/CORE.h similarity index 100% rename from Core/include/CGAL/CORE/export.h rename to Core/include/CGAL/export/CORE.h diff --git a/GraphicsView/include/CGAL/Qt/DemosMainWindow.h b/GraphicsView/include/CGAL/Qt/DemosMainWindow.h index 9a32f9098b8..0351baabb4a 100644 --- a/GraphicsView/include/CGAL/Qt/DemosMainWindow.h +++ b/GraphicsView/include/CGAL/Qt/DemosMainWindow.h @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include // forward declaration diff --git a/GraphicsView/include/CGAL/Qt/GraphicsViewNavigation.h b/GraphicsView/include/CGAL/Qt/GraphicsViewNavigation.h index 366f6890f02..c2380ccf467 100644 --- a/GraphicsView/include/CGAL/Qt/GraphicsViewNavigation.h +++ b/GraphicsView/include/CGAL/Qt/GraphicsViewNavigation.h @@ -22,7 +22,7 @@ #define CGAL_QT_GRAPHICS_VIEW_NAVIGATION_H #include -#include +#include #include #include #include diff --git a/GraphicsView/include/CGAL/Qt/GraphicsViewPolylineInput.h b/GraphicsView/include/CGAL/Qt/GraphicsViewPolylineInput.h index 320a218eb96..9795c0b2467 100644 --- a/GraphicsView/include/CGAL/Qt/GraphicsViewPolylineInput.h +++ b/GraphicsView/include/CGAL/Qt/GraphicsViewPolylineInput.h @@ -22,7 +22,7 @@ #define CGAL_QT_GRAPHICS_VIEW_POLYLINE_INPUT_H #include -#include +#include #include #include diff --git a/GraphicsView/include/CGAL/Qt/debug.h b/GraphicsView/include/CGAL/Qt/debug.h index 33ee464b440..85421f3997e 100644 --- a/GraphicsView/include/CGAL/Qt/debug.h +++ b/GraphicsView/include/CGAL/Qt/debug.h @@ -22,7 +22,7 @@ #define CGAL_QT_DEBUG_H #include -#include +#include #include namespace CGAL { diff --git a/GraphicsView/include/CGAL/Qt/resources.h b/GraphicsView/include/CGAL/Qt/resources.h index 95d7e574ff7..385a3c7caef 100644 --- a/GraphicsView/include/CGAL/Qt/resources.h +++ b/GraphicsView/include/CGAL/Qt/resources.h @@ -20,7 +20,7 @@ #ifndef CGAL_QT_RESOURCES_H #define CGAL_QT_RESOURCES_H -#include +#include // cannot use namespaces because of the Q_INIT_RESOURCE macro CGAL_QT4_EXPORT void CGAL_Qt4_init_resources(); diff --git a/GraphicsView/include/CGAL/Qt/utility.h b/GraphicsView/include/CGAL/Qt/utility.h index 245239ab565..f6f8ddea842 100644 --- a/GraphicsView/include/CGAL/Qt/utility.h +++ b/GraphicsView/include/CGAL/Qt/utility.h @@ -24,7 +24,7 @@ #include #include #include -#include +#include class QGraphicsScene; class QGraphicsView; diff --git a/GraphicsView/include/CGAL/Qt/export.h b/GraphicsView/include/CGAL/export/Qt4.h similarity index 100% rename from GraphicsView/include/CGAL/Qt/export.h rename to GraphicsView/include/CGAL/export/Qt4.h diff --git a/Installation/include/CGAL/config.h b/Installation/include/CGAL/config.h index 23e42aab9a9..4bae87ab6f5 100644 --- a/Installation/include/CGAL/config.h +++ b/Installation/include/CGAL/config.h @@ -45,7 +45,11 @@ #include -#include +//----------------------------------------------------------------------// +// Support for DLL on Windows (CGAL_EXPORT macro) +//----------------------------------------------------------------------// + +#include //----------------------------------------------------------------------// // Enable C++0x features with GCC -std=c++0x (even when not specified at build time) diff --git a/Installation/include/CGAL/export.h b/Installation/include/CGAL/export/CGAL.h similarity index 100% rename from Installation/include/CGAL/export.h rename to Installation/include/CGAL/export/CGAL.h From f15a4f99570ad1bf51d87c84c9b616371c0119ec Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Wed, 12 Oct 2011 10:26:21 +0000 Subject: [PATCH 38/75] more export statements --- GraphicsView/include/CGAL/Qt/GraphicsItem.h | 3 ++- GraphicsView/include/CGAL/Qt/GraphicsViewInput.h | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/GraphicsView/include/CGAL/Qt/GraphicsItem.h b/GraphicsView/include/CGAL/Qt/GraphicsItem.h index 210db7aa839..0b062423e28 100644 --- a/GraphicsView/include/CGAL/Qt/GraphicsItem.h +++ b/GraphicsView/include/CGAL/Qt/GraphicsItem.h @@ -21,6 +21,7 @@ #ifndef CGAL_QT_GRAPHICS_ITEM_H #define CGAL_QT_GRAPHICS_ITEM_H +#include #include #include #include @@ -31,7 +32,7 @@ namespace CGAL { namespace Qt { -class GraphicsItem : public QObject, public QGraphicsItem { +class CGAL_QT4_EXPORT GraphicsItem : public QObject, public QGraphicsItem { Q_OBJECT #if QT_VERSION >= 0x040600 diff --git a/GraphicsView/include/CGAL/Qt/GraphicsViewInput.h b/GraphicsView/include/CGAL/Qt/GraphicsViewInput.h index efa3b5539f8..4c06d05f88e 100644 --- a/GraphicsView/include/CGAL/Qt/GraphicsViewInput.h +++ b/GraphicsView/include/CGAL/Qt/GraphicsViewInput.h @@ -20,14 +20,14 @@ #ifndef CGAL_QT_GRAPHICS_VIEW_INPUT_H #define CGAL_QT_GRAPHICS_VIEW_INPUT_H - +#include #include #include #include namespace CGAL { namespace Qt { -class GraphicsViewInput : public QObject +class CGAL_QT4_EXPORT GraphicsViewInput : public QObject { Q_OBJECT From 6985effcc8404f8aa2dd48522762d1cd8381689b Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Wed, 12 Oct 2011 13:47:18 +0000 Subject: [PATCH 39/75] Fix the CMake module CGAL_SetupBoost shipped with CGAL CGAL_Boost_USE_STATIC_LIBS is now an (advanced) CMake option on all platforms, and is stored in the generated CGALConfig.cmake. That way, its value is proposed as the default value for the same option when programs using CGAL are configured using CMake. The script UseCGAL includes the module CGAL_TweakFindBoost, to define Boost_USE_STATIC_LIBS and Boost_ADDITIONAL_VERSIONS. --- .gitattributes | 1 + .../cmake/modules/CGALConfig_binary.cmake.in | 3 +- .../cmake/modules/CGALConfig_install.cmake.in | 9 ++- .../cmake/modules/CGAL_SetupBoost.cmake | 26 ++----- .../cmake/modules/CGAL_TweakFindBoost.cmake | 75 +++++++++++++++++++ Installation/cmake/modules/UseCGAL.cmake | 1 + 6 files changed, 89 insertions(+), 26 deletions(-) create mode 100644 Installation/cmake/modules/CGAL_TweakFindBoost.cmake diff --git a/.gitattributes b/.gitattributes index 0bb56aff483..3940ce8ea51 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1727,6 +1727,7 @@ Installation/cmake/modules/CGAL_SetupLEDA.cmake -text Installation/cmake/modules/CGAL_SetupMPFI.cmake -text Installation/cmake/modules/CGAL_SetupNTL.cmake -text Installation/cmake/modules/CGAL_SetupRS.cmake -text +Installation/cmake/modules/CGAL_TweakFindBoost.cmake -text Installation/cmake/modules/CGAL_UseBLAS.cmake -text Installation/cmake/modules/CGAL_UseLAPACK.cmake -text Installation/cmake/modules/CGAL_UseMKL.cmake -text diff --git a/Installation/cmake/modules/CGALConfig_binary.cmake.in b/Installation/cmake/modules/CGALConfig_binary.cmake.in index 7039b0d1ffa..da924971ab4 100644 --- a/Installation/cmake/modules/CGALConfig_binary.cmake.in +++ b/Installation/cmake/modules/CGALConfig_binary.cmake.in @@ -15,7 +15,8 @@ set(CGAL_MAJOR_VERSION "@CGAL_MAJOR_VERSION@" ) set(CGAL_MINOR_VERSION "@CGAL_MINOR_VERSION@" ) set(CGAL_BUILD_VERSION "@CGAL_BUILD_VERSION@" ) -set(CGAL_BUILD_SHARED_LIBS "@CGAL_BUILD_SHARED_LIBS@" ) +set(CGAL_BUILD_SHARED_LIBS "@CGAL_BUILD_SHARED_LIBS@" ) +set(CGAL_Boost_USE_STATIC_LIBS "@CGAL_Boost_USE_STATIC_LIBS@" ) set(CGAL_CXX_FLAGS_INIT "@CMAKE_CXX_FLAGS@" ) set(CGAL_CXX_FLAGS_RELEASE_INIT "@CMAKE_CXX_FLAGS_RELEASE@" ) diff --git a/Installation/cmake/modules/CGALConfig_install.cmake.in b/Installation/cmake/modules/CGALConfig_install.cmake.in index 4a77f200642..0ae8ef6f5bb 100644 --- a/Installation/cmake/modules/CGALConfig_install.cmake.in +++ b/Installation/cmake/modules/CGALConfig_install.cmake.in @@ -11,11 +11,12 @@ set(CGAL_CONFIG_LOADED TRUE) # CGAL_DIR is the directory where this CGALConfig.cmake is installed set(CGAL_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@") -set(CGAL_MAJOR_VERSION "@CGAL_MAJOR_VERSION@" ) -set(CGAL_MINOR_VERSION "@CGAL_MINOR_VERSION@" ) -set(CGAL_BUILD_VERSION "@CGAL_BUILD_VERSION@" ) +set(CGAL_MAJOR_VERSION "@CGAL_MAJOR_VERSION@" ) +set(CGAL_MINOR_VERSION "@CGAL_MINOR_VERSION@" ) +set(CGAL_BUILD_VERSION "@CGAL_BUILD_VERSION@" ) -set(CGAL_BUILD_SHARED_LIBS "@CGAL_BUILD_SHARED_LIBS@" ) +set(CGAL_BUILD_SHARED_LIBS "@CGAL_BUILD_SHARED_LIBS@" ) +set(CGAL_Boost_USE_STATIC_LIBS "@CGAL_Boost_USE_STATIC_LIBS@" ) set(CGAL_CXX_FLAGS_INIT "@CMAKE_CXX_FLAGS@" ) set(CGAL_CXX_FLAGS_RELEASE_INIT "@CMAKE_CXX_FLAGS_RELEASE@" ) diff --git a/Installation/cmake/modules/CGAL_SetupBoost.cmake b/Installation/cmake/modules/CGAL_SetupBoost.cmake index 4369fcfc104..fc3dc11f4c3 100644 --- a/Installation/cmake/modules/CGAL_SetupBoost.cmake +++ b/Installation/cmake/modules/CGAL_SetupBoost.cmake @@ -1,25 +1,9 @@ if ( NOT CGAL_Boost_Setup ) - - if(WIN32) - option(CGAL_BOOST_USE_STATIC_LIBS "Link with static Boost libraries" OFF) - if(CGAL_BOOST_USE_STATIC_LIBS) - set(Boost_USE_STATIC_LIBS ON) - else() - set(Boost_USE_STATIC_LIBS OFF) - add_to_cached_list(CGAL_3RD_PARTY_DEFINITIONS -DBOOST_ALL_DYN_LINK) - endif() - else(WIN32) - if ( NOT BUILD_SHARED_LIBS ) - set(Boost_USE_STATIC_LIBS ON) - endif() - endif(WIN32) - - set(Boost_FIND_VERSION 1.33.1 ) - set(Boost_FIND_VERSION_MAJOR 1 ) - set(Boost_FIND_VERSION_MINOR 33 ) - set(Boost_FIND_VERSION_PATCH 1 ) - - find_package( Boost REQUIRED thread ) + + include(CGAL_TweakFindBoost) + # In the documentation, we say we require Boost-1.39, but technically we + # require 1.33.1. Some packages may require more recent versions, though. + find_package( Boost 1.33.1 REQUIRED thread ) message( STATUS "Boost include: ${Boost_INCLUDE_DIRS}" ) message( STATUS "Boost libraries: ${Boost_LIBRARIES}" ) diff --git a/Installation/cmake/modules/CGAL_TweakFindBoost.cmake b/Installation/cmake/modules/CGAL_TweakFindBoost.cmake new file mode 100644 index 00000000000..f50b7d406fe --- /dev/null +++ b/Installation/cmake/modules/CGAL_TweakFindBoost.cmake @@ -0,0 +1,75 @@ +# - Defines Boost_USE_STATIC_LIBS and Boost_ADDITIONAL_VERSIONS +# +# This module sets the CMake variables: +# +# == Boost_USE_STATIC_LIBS == +# +# The option CGAL_Boost_USE_STATIC_LIBS is created in the cache, as +# advanced option. If CGALConfig.cmake has been loaded, the default value +# of that option is the value loaded from CGALConfig.cmake (this file was +# created during the configuration of CGAL libraries). Otherwise, the +# default value of that option is OFF. +# +# The variable Boost_USE_STATIC_LIBS is set to the value of the option +# CGAL_Boost_USE_STATIC_LIBS. +# +# Additionally, if Boost_USE_STATIC_LIBS is OFF, the definition +# BOOST_ALL_DYN_LINK is added to CGAL_3RD_PARTY_DEFINITIONS, so that the +# auto-linking feature on Windows knows that it must search for dynamic +# libraries. +# +# == Boost_ADDITIONAL_VERSIONS == +# +# This option is filled with a long list of Boost versions. That allows the +# module FindBoost to find more recent Boost versions, even if the file +# FindBoost.cmake is old. + +if( NOT CGAL_TweakFindBoost ) + if(CGAL_Boost_USE_STATIC_LIBS) + # If the option is loaded from CGALConfig.h, use its value as default + # value. But the user will still have the choice to change the + # value. That means that we can build the CGAL libraries using static + # or shared Boost libraries, and after build programs using CGAL with a + # different setting for Boost libraries. + set(CGAL_Boost_USE_STATIC_LIBS_DEFAULT ${CGAL_Boost_USE_STATIC_LIBS}) + else() + # Else the option is OFF by default. That means the use of shared Boost + # libraries is the default. + set(CGAL_Boost_USE_STATIC_LIBS_DEFAULT OFF) + endif() + + option(CGAL_Boost_USE_STATIC_LIBS "Link with static Boost libraries" ${CGAL_Boost_USE_STATIC_LIBS_DEFAULT}) + mark_as_advanced(CGAL_Boost_USE_STATIC_LIBS) + + if(CGAL_Boost_USE_STATIC_LIBS) + set(Boost_USE_STATIC_LIBS ON) + else() + set(Boost_USE_STATIC_LIBS OFF) + add_to_cached_list(CGAL_3RD_PARTY_DEFINITIONS -DBOOST_ALL_DYN_LINK) + endif() + + set(Boost_ADDITIONAL_VERSIONS + "1.56.1" "1.56.0" "1.56" + "1.55.1" "1.55.0" "1.55" + "1.54.1" "1.54.0" "1.54" + "1.53.1" "1.53.0" "1.53" + "1.52.1" "1.52.0" "1.52" + "1.51.1" "1.51.0" "1.51" + "1.50.1" "1.50.0" "1.50" + "1.49.1" "1.49.0" "1.49" + "1.48.1" "1.48.0" "1.48" + "1.47.1" "1.47.0" "1.47" + "1.46.1" "1.46.0" "1.46" + "1.45.1" "1.45.0" "1.45" + "1.44.1" "1.44.0" "1.44" + "1.43.1" "1.43.0" "1.43" + "1.42.1" "1.42.0" "1.42" + "1.41.1" "1.41.0" "1.41" + "1.40.1" "1.40.0" "1.40" + "1.39.1" "1.39.0" "1.39" + "1.38.1" "1.38.0" "1.38" + "1.37.1" "1.37.0" "1.37") + + + set(CGAL_TweakFindBoost) +endif() diff --git a/Installation/cmake/modules/UseCGAL.cmake b/Installation/cmake/modules/UseCGAL.cmake index 3d904583a89..443a5b4b2d6 100644 --- a/Installation/cmake/modules/UseCGAL.cmake +++ b/Installation/cmake/modules/UseCGAL.cmake @@ -17,6 +17,7 @@ if(NOT USE_CGAL_FILE_INCLUDED) include(CGAL_Common) include(CGAL_SetupFlags) include(CGAL_GeneratorSpecificSettings) + include(CGAL_TweakFindBoost) set( CGAL_LIBRARIES ) From b9ed6515b1baac8966a55426e27162a5142293b1 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Wed, 12 Oct 2011 13:47:54 +0000 Subject: [PATCH 40/75] Documentation fix The name of the option is BUILD_SHARED_LIBS (standard CMake variable name) and not CGAL_BUILD_SHARED_LIBS. --- Installation/doc_tex/Installation/installation.tex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Installation/doc_tex/Installation/installation.tex b/Installation/doc_tex/Installation/installation.tex index ef2049d2521..004f2b6e8ef 100644 --- a/Installation/doc_tex/Installation/installation.tex +++ b/Installation/doc_tex/Installation/installation.tex @@ -558,7 +558,7 @@ This is not an issue for solution/project files, as there the user selects the b Shared libraries ({\tt .dll} on Windows, {\tt .so} on Linux, {\tt .dylib} on MacOS) are built by default. You can choose to produce static libraries instead by setting the \cmake\ variable -{\tt CGAL\_BUILD\_SHARED\_LIBS=FALSE}. If you use \texttt{cmake-gui}, that +{\tt BUILD\_SHARED\_LIBS=FALSE}. If you use \texttt{cmake-gui}, that variable appears as a checkable option in the graphical user interface. \subsection{Multiple Variants of makefiles}\label{sec:cmake-out-of-source} From 7225ec7d1c31629e01e3a276a19cffeb9f89c0bb Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Wed, 12 Oct 2011 14:39:57 +0000 Subject: [PATCH 41/75] Fix bug in a previous commit A variable must be in cache before is can be use with add_to_cached_list. --- Installation/cmake/modules/CGAL_TweakFindBoost.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/Installation/cmake/modules/CGAL_TweakFindBoost.cmake b/Installation/cmake/modules/CGAL_TweakFindBoost.cmake index f50b7d406fe..565d6517086 100644 --- a/Installation/cmake/modules/CGAL_TweakFindBoost.cmake +++ b/Installation/cmake/modules/CGAL_TweakFindBoost.cmake @@ -45,6 +45,7 @@ if( NOT CGAL_TweakFindBoost ) set(Boost_USE_STATIC_LIBS ON) else() set(Boost_USE_STATIC_LIBS OFF) + cache_set(CGAL_3RD_PARTY_DEFINITIONS) add_to_cached_list(CGAL_3RD_PARTY_DEFINITIONS -DBOOST_ALL_DYN_LINK) endif() From d57c543d60db372e50cc33de36ee7beb9521b9c7 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Wed, 12 Oct 2011 15:03:08 +0000 Subject: [PATCH 42/75] Bug fix again. Use cache_set with two arguments. --- Installation/cmake/modules/CGAL_TweakFindBoost.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Installation/cmake/modules/CGAL_TweakFindBoost.cmake b/Installation/cmake/modules/CGAL_TweakFindBoost.cmake index 565d6517086..8457bb96739 100644 --- a/Installation/cmake/modules/CGAL_TweakFindBoost.cmake +++ b/Installation/cmake/modules/CGAL_TweakFindBoost.cmake @@ -45,7 +45,9 @@ if( NOT CGAL_TweakFindBoost ) set(Boost_USE_STATIC_LIBS ON) else() set(Boost_USE_STATIC_LIBS OFF) - cache_set(CGAL_3RD_PARTY_DEFINITIONS) + # First, add the variable to cache, if it was loaded from CGALConfig.cmake + cache_set(CGAL_3RD_PARTY_DEFINITIONS "${CGAL_3RD_PARTY_DEFINITIONS}") + # Then amend it add_to_cached_list(CGAL_3RD_PARTY_DEFINITIONS -DBOOST_ALL_DYN_LINK) endif() From 992b2e5bed7629398d81d9c75c3ff9a415abfc2b Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Wed, 12 Oct 2011 16:26:57 +0000 Subject: [PATCH 43/75] Modify the release name, to avoid confusion --- Maintenance/release_building/public_release_name | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Maintenance/release_building/public_release_name b/Maintenance/release_building/public_release_name index b6a488abce8..563074ef8ea 100644 --- a/Maintenance/release_building/public_release_name +++ b/Maintenance/release_building/public_release_name @@ -1 +1 @@ -CGAL-3.10-dev +CGAL-LGPLv3-QPL-3.10-dev From b2307d85746ea352ef6d7697ce10844f948c53b7 Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Thu, 13 Oct 2011 08:40:24 +0000 Subject: [PATCH 44/75] Add missing export statements --- CGALimageIO/include/CGAL/ImageIO.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CGALimageIO/include/CGAL/ImageIO.h b/CGALimageIO/include/CGAL/ImageIO.h index 8ef046965ba..9e3e52c0c8e 100644 --- a/CGALimageIO/include/CGAL/ImageIO.h +++ b/CGALimageIO/include/CGAL/ImageIO.h @@ -301,11 +301,11 @@ typedef struct point_image { /** Allocates and initializes an image descriptor */ -_image *_initImage(); +CGAL_IMAGEIO_EXPORT _image *_initImage(); /** Free an image descriptor @param im image descriptor */ -void _freeImage(_image *im); +CGAL_IMAGEIO_EXPORT void _freeImage(_image *im); /** creates an image descriptor from the given header information @param x image x dimension (number of columns) @@ -318,9 +318,9 @@ void _freeImage(_image *im); @param w image word size in bytes @param wk image word kind @param sgn image word sign */ -_image *_createImage(int x, int y, int z, int v, - float vx, float vy, float vz, int w, - WORD_KIND wk, SIGN sgn); +CGAL_IMAGEIO_EXPORT _image *_createImage(int x, int y, int z, int v, + float vx, float vy, float vz, int w, + WORD_KIND wk, SIGN sgn); /** Reads an image from a file and returns an image descriptor or NULL if
From edecb70af6c8d7f675e09cfc1b2a7b59331aa4be Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Thu, 13 Oct 2011 09:14:05 +0000 Subject: [PATCH 45/75] Add export statements --- CGALimageIO/include/CGAL/Image_3.h | 12 +++++++++++- .../CGALimageIO/test_trilinear_interpolation.cpp | 7 ++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/CGALimageIO/include/CGAL/Image_3.h b/CGALimageIO/include/CGAL/Image_3.h index 38096f79540..769a2afbc39 100644 --- a/CGALimageIO/include/CGAL/Image_3.h +++ b/CGALimageIO/include/CGAL/Image_3.h @@ -33,6 +33,11 @@ #include #include + +#if defined(BOOST_MSVC) +# pragma warning(push) +# pragma warning(disable:4244) // double float conversion loss of data +#endif class vtkImageData; namespace CGAL { @@ -54,7 +59,7 @@ public: } // end namespace CGAL::ImageIO -class Image_3 +class CGAL_IMAGEIO_EXPORT Image_3 { struct Image_deleter { void operator()(_image* image) @@ -479,5 +484,10 @@ Image_3::labellized_trilinear_interpolation(const Coord_type& x, } // end namespace CGAL + +#if defined(BOOST_MSVC) +# pragma warning(pop) +#endif + #endif // CGAL_IMAGE_3_H diff --git a/CGALimageIO/test/CGALimageIO/test_trilinear_interpolation.cpp b/CGALimageIO/test/CGALimageIO/test_trilinear_interpolation.cpp index 8abb197e739..f8d99408e45 100644 --- a/CGALimageIO/test/CGALimageIO/test_trilinear_interpolation.cpp +++ b/CGALimageIO/test/CGALimageIO/test_trilinear_interpolation.cpp @@ -7,6 +7,11 @@ #include #include + +#if defined(BOOST_MSVC) +# pragma warning(disable:4244) // double float conversion loss of data +#endif + typedef unsigned char Word; int main() { @@ -90,7 +95,7 @@ int main() { image.trilinear_interpolation(d_x, d_y, d_z, - 0); + 0.f); const float value3 = triLinInterp(image.image(), d_x, From e337d22aa284762cb0143da4a21789e59e54fe0d Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Thu, 13 Oct 2011 10:03:33 +0000 Subject: [PATCH 46/75] Add export statements --- .../CGAL/Polynomial/internal/Rational/Evaluate_polynomial.h | 3 ++- Kinetic_data_structures/include/CGAL/Tools/Log.h | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Evaluate_polynomial.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Evaluate_polynomial.h index 253bbf9d85b..a184a61bbe5 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Evaluate_polynomial.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Rational/Evaluate_polynomial.h @@ -20,12 +20,13 @@ #ifndef CGAL_POLYNOMIAL_INTERNAL_EVALUATE_H #define CGAL_POLYNOMIAL_INTERNAL_EVALUATE_H +#include #include #include namespace CGAL { namespace POLYNOMIAL { namespace internal { -double evaluate_polynomial(const double *b, const double *e, double t); +CGAL_EXPORT double evaluate_polynomial(const double *b, const double *e, double t); template inline NT evaluate_polynomial(const std::vector &coefs, const NT &t) diff --git a/Kinetic_data_structures/include/CGAL/Tools/Log.h b/Kinetic_data_structures/include/CGAL/Tools/Log.h index 0d822ace593..cd1a1e61df3 100644 --- a/Kinetic_data_structures/include/CGAL/Tools/Log.h +++ b/Kinetic_data_structures/include/CGAL/Tools/Log.h @@ -35,7 +35,7 @@ public: enum Target {COUT, FILE, DEVNULL}; private: - struct State { + struct CGAL_EXPORT State { Target target_; Level level_; std::ofstream fstream_; @@ -52,7 +52,7 @@ private: output_maple_=true; } }; - static State state_; + CGAL_EXPORT static State state_; public: // The different types of logs supported /* MAPLE is a log which should be able to be fed directly in to From 9bf86bcd07e439dbafa6ffd27d3ac96bf0ef1a78 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Thu, 13 Oct 2011 14:16:09 +0000 Subject: [PATCH 47/75] When LGPLv3 is used, the text of GPLv3 must be shipped, too. LGPLv3 is a addendum to GPLv3. For that reason, LGPLv3 terms ask that both texts must are shipped in any distribution. --- .gitattributes | 1 + Installation/LICENSE.GPL | 674 +++++++++++++++++++++++++++++++++++++++ Installation/README | 3 +- 3 files changed, 677 insertions(+), 1 deletion(-) create mode 100644 Installation/LICENSE.GPL diff --git a/.gitattributes b/.gitattributes index 3940ce8ea51..3777469dfb4 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1700,6 +1700,7 @@ HalfedgeDS/examples/HalfedgeDS/hds_prog_default_with_ccb.cpp -text HalfedgeDS/examples/HalfedgeDS/hds_prog_graph_with_ccb.cpp -text Installation/INSTALL -text Installation/LICENSE.FREE_USE -text +Installation/LICENSE.GPL -text Installation/VERSION -text Installation/auxiliary/cgal_create_cmake_script.1 -text Installation/cgal.css svneol=native#text/css diff --git a/Installation/LICENSE.GPL b/Installation/LICENSE.GPL new file mode 100644 index 00000000000..94a9ed024d3 --- /dev/null +++ b/Installation/LICENSE.GPL @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/Installation/README b/Installation/README index 2edabccf0c7..cdce20f9103 100644 --- a/Installation/README +++ b/Installation/README @@ -9,7 +9,8 @@ This distribution of CGAL includes: INSTALL - information about the installation process LICENSE - describes the license of CGAL LICENSE.FREE_USE - text of the free use license (see LICENSE file) - LICENSE.LGPL - text of LGPL v2.1 license + LICENSE.GPL - text of GPL v3 license + LICENSE.LGPL - text of LGPL v3 license LICENSE.QPL - text of the QPL v1.0 license README - this file VERSION - version number of this release From 5fd463b2bb7f506c42fd46dfb84ada0ba17327f4 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Thu, 13 Oct 2011 14:16:49 +0000 Subject: [PATCH 48/75] Add LICENSE.GPL to the install target. --- Installation/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Installation/CMakeLists.txt b/Installation/CMakeLists.txt index 4feb24be075..0fe42f4b82b 100644 --- a/Installation/CMakeLists.txt +++ b/Installation/CMakeLists.txt @@ -629,7 +629,7 @@ create_CGALconfig_files() # DESTINATION option is mandatory; skipping it breaks CPack! if(CGAL_INSTALL_DOC_DIR) - install(FILES AUTHORS CHANGES LICENSE LICENSE.FREE_USE LICENSE.LGPL LICENSE.QPL DESTINATION ${CGAL_INSTALL_DOC_DIR} ) + install(FILES AUTHORS CHANGES LICENSE LICENSE.FREE_USE LICENSE.GPL LICENSE.LGPL LICENSE.QPL DESTINATION ${CGAL_INSTALL_DOC_DIR} ) endif() #install all includes collected in trunk et cetera From e3eef962d7b827dc74727dae5608124499b557f0 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Thu, 13 Oct 2011 15:34:44 +0000 Subject: [PATCH 49/75] Do not add -DBOOST_DYN_LINK with auto-link if not enabled. In particular, do not add that macro definition on Linux/MacOS. --- .../cmake/modules/CGAL_TweakFindBoost.cmake | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/Installation/cmake/modules/CGAL_TweakFindBoost.cmake b/Installation/cmake/modules/CGAL_TweakFindBoost.cmake index 8457bb96739..a9c71a8f854 100644 --- a/Installation/cmake/modules/CGAL_TweakFindBoost.cmake +++ b/Installation/cmake/modules/CGAL_TweakFindBoost.cmake @@ -13,10 +13,10 @@ # The variable Boost_USE_STATIC_LIBS is set to the value of the option # CGAL_Boost_USE_STATIC_LIBS. # -# Additionally, if Boost_USE_STATIC_LIBS is OFF, the definition -# BOOST_ALL_DYN_LINK is added to CGAL_3RD_PARTY_DEFINITIONS, so that the -# auto-linking feature on Windows knows that it must search for dynamic -# libraries. +# Additionally, if Boost_USE_STATIC_LIBS is OFF, and the auto-linking is +# enabled, the definition BOOST_ALL_DYN_LINK is added to +# CGAL_3RD_PARTY_DEFINITIONS, so that the auto-linking feature on Windows +# knows that it must search for dynamic libraries. # # == Boost_ADDITIONAL_VERSIONS == # @@ -45,10 +45,15 @@ if( NOT CGAL_TweakFindBoost ) set(Boost_USE_STATIC_LIBS ON) else() set(Boost_USE_STATIC_LIBS OFF) - # First, add the variable to cache, if it was loaded from CGALConfig.cmake - cache_set(CGAL_3RD_PARTY_DEFINITIONS "${CGAL_3RD_PARTY_DEFINITIONS}") - # Then amend it - add_to_cached_list(CGAL_3RD_PARTY_DEFINITIONS -DBOOST_ALL_DYN_LINK) + if(CGAL_AUTO_LINK_ENABLED) + # One must add -DBOOST_ALL_DYN_LINK to DEFINITIONS to use Boost + # auto-link with shared libraries. + + # First, add the variable to cache, if it was loaded from CGALConfig.cmake + cache_set(CGAL_3RD_PARTY_DEFINITIONS "${CGAL_3RD_PARTY_DEFINITIONS}") + # Then amend it + add_to_cached_list(CGAL_3RD_PARTY_DEFINITIONS -DBOOST_ALL_DYN_LINK) + endif() endif() set(Boost_ADDITIONAL_VERSIONS From 5da9888303ca0f6063db4847467a0d58fc78415d Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Thu, 13 Oct 2011 15:38:13 +0000 Subject: [PATCH 50/75] Typo in text: s/option/variable/ --- Installation/cmake/modules/CGAL_TweakFindBoost.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Installation/cmake/modules/CGAL_TweakFindBoost.cmake b/Installation/cmake/modules/CGAL_TweakFindBoost.cmake index a9c71a8f854..e67f48a414e 100644 --- a/Installation/cmake/modules/CGAL_TweakFindBoost.cmake +++ b/Installation/cmake/modules/CGAL_TweakFindBoost.cmake @@ -20,9 +20,9 @@ # # == Boost_ADDITIONAL_VERSIONS == # -# This option is filled with a long list of Boost versions. That allows the -# module FindBoost to find more recent Boost versions, even if the file -# FindBoost.cmake is old. +# The variable Boost_ADDITIONAL_VERSIONS is filled with a long list of +# Boost versions. That allows the module FindBoost to find more recent +# Boost versions, even if the file FindBoost.cmake is old. if( NOT CGAL_TweakFindBoost ) if(CGAL_Boost_USE_STATIC_LIBS) From f8a1a2e2c81912b6963b906fb56d628409ea5026 Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Mon, 17 Oct 2011 13:08:07 +0000 Subject: [PATCH 51/75] Suppress warning about potential dll linkage problem --- Kinetic_data_structures/src/CGAL/KDS_Log.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Kinetic_data_structures/src/CGAL/KDS_Log.cpp b/Kinetic_data_structures/src/CGAL/KDS_Log.cpp index 383c6240f17..a2d296c7320 100644 --- a/Kinetic_data_structures/src/CGAL/KDS_Log.cpp +++ b/Kinetic_data_structures/src/CGAL/KDS_Log.cpp @@ -18,6 +18,11 @@ // // Author(s) : Daniel Russel +#include + +#if defined(BOOST_MSVC) +# pragma warning(disable:4251) +#endif #include #include From 9059b29647b74d44e592919f621c77fea5f6c93e Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Mon, 17 Oct 2011 16:02:12 +0000 Subject: [PATCH 52/75] Fix and factorize post-build commands on Windows The function build_cgal_library defined in Installation/src/CMakeLists.txt now handles a lot more than before, to factorize between the various */src/*/CMakeLists.txt files used to build CGAL libraries. For example, the definition of mangled names is now factorized in that function. Installation/src/CMakeLists.txt also sets the output directories for runtime, shared libraries, and static libraries. DLLs will be created in bin/ instead of lib/. --- Core/src/CGALCore/CMakeLists.txt | 33 -------------- GraphicsView/src/CGALQt4/CMakeLists.txt | 30 ------------- Installation/CMakeLists.txt | 5 --- Installation/src/CGAL/CMakeLists.txt | 34 --------------- Installation/src/CMakeLists.txt | 57 ++++++++++++++++++++++--- Qt_widget/src/CGALQt3/CMakeLists.txt | 32 -------------- 6 files changed, 51 insertions(+), 140 deletions(-) diff --git a/Core/src/CGALCore/CMakeLists.txt b/Core/src/CGALCore/CMakeLists.txt index 7f6ab1d0bae..fc351564fb5 100644 --- a/Core/src/CGALCore/CMakeLists.txt +++ b/Core/src/CGALCore/CMakeLists.txt @@ -32,39 +32,6 @@ set_target_properties(CGAL_Core PROPERTIES VERSION "${CGAL_SOVERSION}" SOVERSION set( CGAL_Core_BASENAME CGAL_Core ) -if (NOT CGAL_AUTO_LINK_ENABLED ) - - set_target_properties( CGAL_Core PROPERTIES OUTPUT_NAME ${CGAL_Core_BASENAME} ) - target_link_libraries( CGAL_Core ${CGAL_3RD_PARTY_LIBRARIES}) - - get_target_property( CGAL_Core_LIBRARY_FULL_PATH CGAL_Core LOCATION ) - - set(CGAL_Core_LIBRARY ${CGAL_Core_LIBRARY_FULL_PATH} CACHE STRING "The CGAL_Core library" FORCE) - - mark_as_advanced(CGAL_Core_LIBRARY) - -else() - - set(CGAL_Core_LIBRARY) - - set(CGAL_Core_RELEASE_MANGLED_NAME "${CGAL_Core_BASENAME}-${CGAL_TOOLSET}-mt" ) - set(CGAL_Core_DEBUG_MANGLED_NAME "${CGAL_Core_BASENAME}-${CGAL_TOOLSET}-mt-gd" ) - set(CGAL_Core_MINSIZEREL_MANGLED_NAME "${CGAL_Core_BASENAME}-${CGAL_TOOLSET}-mt-o" ) - set(CGAL_Core_RELWITHDEBINFO_MANGLED_NAME "${CGAL_Core_BASENAME}-${CGAL_TOOLSET}-mt-g" ) - - set_target_properties( CGAL_Core PROPERTIES DEBUG_OUTPUT_NAME "${CGAL_Core_DEBUG_MANGLED_NAME}" - RELEASE_OUTPUT_NAME "${CGAL_Core_RELEASE_MANGLED_NAME}" - MINSIZEREL_OUTPUT_NAME "${CGAL_Core_MINSIZEREL_MANGLED_NAME}" - RELWITHDEBINFO_OUTPUT_NAME "${CGAL_Core_RELWITHDEBINFO_MANGLED_NAME}" - ) - - if ( HAS_CFG_INTDIR ) - add_custom_command(TARGET CGAL_Core POST_BUILD COMMAND copy /Y \"$(TargetDir)CGAL_core*.lib\" \"$(SolutionDir)lib\" ) - add_custom_command(TARGET CGAL_Core POST_BUILD COMMAND if exist \"$(TargetDir)$(TargetName).pdb\" copy /Y \"$(TargetDir)CGAL_core*.pdb\" \"$(SolutionDir)lib\" ) - endif() - -endif() - if ( CGAL_INSTALL_LIB_DIR ) install(TARGETS CGAL_Core DESTINATION ${CGAL_INSTALL_LIB_DIR} ) endif() diff --git a/GraphicsView/src/CGALQt4/CMakeLists.txt b/GraphicsView/src/CGALQt4/CMakeLists.txt index 1e027b245a3..a2e7bcdacc5 100644 --- a/GraphicsView/src/CGALQt4/CMakeLists.txt +++ b/GraphicsView/src/CGALQt4/CMakeLists.txt @@ -96,36 +96,6 @@ if( QT4_FOUND ) set_target_properties(CGAL_Qt4 PROPERTIES VERSION "${CGAL_SOVERSION}" SOVERSION "${CGAL_SONAME_VERSION}") endif() - if (NOT CGAL_AUTO_LINK_ENABLED ) - - set_target_properties( CGAL_Qt4 PROPERTIES OUTPUT_NAME "${CGAL_Qt4_BASENAME}" ) - get_target_property( CGAL_Qt4_LIBRARY_FULL_PATH CGAL_Qt4 LOCATION ) - - set(CGAL_Qt4_LIBRARY "${CGAL_Qt4_LIBRARY_FULL_PATH}" CACHE STRING "The CGAL_Qt4 library" FORCE) - mark_as_advanced(CGAL_Qt4_LIBRARY) - - else() - - set(CGAL_Qt4_LIBRARY) - - set(CGAL_Qt4_RELEASE_MANGLED_NAME "${CGAL_Qt4_BASENAME}-${CGAL_TOOLSET}-mt" ) - set(CGAL_Qt4_DEBUG_MANGLED_NAME "${CGAL_Qt4_BASENAME}-${CGAL_TOOLSET}-mt-gd" ) - set(CGAL_Qt4_MINSIZEREL_MANGLED_NAME "${CGAL_Qt4_BASENAME}-${CGAL_TOOLSET}-mt-o" ) - set(CGAL_Qt4_RELWITHDEBINFO_MANGLED_NAME "${CGAL_Qt4_BASENAME}-${CGAL_TOOLSET}-mt-g" ) - - set_target_properties( CGAL_Qt4 PROPERTIES DEBUG_OUTPUT_NAME "${CGAL_Qt4_DEBUG_MANGLED_NAME}" - RELEASE_OUTPUT_NAME "${CGAL_Qt4_RELEASE_MANGLED_NAME}" - MINSIZEREL_OUTPUT_NAME "${CGAL_Qt4_MINSIZEREL_MANGLED_NAME}" - RELWITHDEBINFO_OUTPUT_NAME "${CGAL_Qt4_RELWITHDEBINFO_MANGLED_NAME}" - ) - - if ( HAS_CFG_INTDIR ) - add_custom_command(TARGET CGAL_Qt4 POST_BUILD COMMAND copy /Y \"$(TargetPath)\" \"$(SolutionDir)lib\" ) - add_custom_command(TARGET CGAL_Qt4 POST_BUILD COMMAND if exist \"$(TargetDir)$(TargetName).pdb\" copy /Y \"$(TargetDir)$(TargetName).pdb\" \"$(SolutionDir)lib\" ) - endif() - - endif() - if ( CGAL_INSTALL_LIB_DIR ) install(TARGETS CGAL_Qt4 DESTINATION ${CGAL_INSTALL_LIB_DIR} ) endif() diff --git a/Installation/CMakeLists.txt b/Installation/CMakeLists.txt index 0fe42f4b82b..79fbb36b25e 100644 --- a/Installation/CMakeLists.txt +++ b/Installation/CMakeLists.txt @@ -534,8 +534,6 @@ set ( CGAL_INSTALL_MAN_DIR "share/man/man1" set(CGAL_LIBRARIES_DIR ${CMAKE_BINARY_DIR}/lib) -set(LIBRARY_OUTPUT_PATH ${CGAL_LIBRARIES_DIR}) - set(CGAL_INCLUDE_DIRS ${CMAKE_BINARY_DIR}/include) foreach (package ${CGAL_CONFIGURED_PACKAGES}) @@ -552,9 +550,6 @@ cache_get(CGAL_3RD_PARTY_INCLUDE_DIRS ) cache_get(CGAL_3RD_PARTY_LIBRARIES ) cache_get(CGAL_3RD_PARTY_LIBRARIES_DIRS) -hide_variable(EXECUTABLE_OUTPUT_PATH) -hide_variable(LIBRARY_OUTPUT_PATH) - # # Repeat some problems diff --git a/Installation/src/CGAL/CMakeLists.txt b/Installation/src/CGAL/CMakeLists.txt index be2211f2d7d..92afae196f9 100644 --- a/Installation/src/CGAL/CMakeLists.txt +++ b/Installation/src/CGAL/CMakeLists.txt @@ -12,40 +12,6 @@ set( CGAL_BASENAME CGAL ) set_target_properties(CGAL PROPERTIES VERSION "${CGAL_SOVERSION}" SOVERSION "${CGAL_SONAME_VERSION}") -if (NOT CGAL_AUTO_LINK_ENABLED ) - - set_target_properties( CGAL PROPERTIES OUTPUT_NAME "${CGAL_BASENAME}" ) - - get_target_property( CGAL_LIBRARY_FULL_PATH CGAL LOCATION ) - - set(CGAL_LIBRARY "${CGAL_LIBRARY_FULL_PATH}" CACHE STRING "The CGAL library" FORCE) - - hide_variable(CGAL_LIBRARY) - -else() - - set(CGAL_Release_MANGLED_NAME "${CGAL_BASENAME}-${CGAL_TOOLSET}-mt" ) - set(CGAL_Debug_MANGLED_NAME "${CGAL_BASENAME}-${CGAL_TOOLSET}-mt-gd" ) - set(CGAL_MinSizeRel_MANGLED_NAME "${CGAL_BASENAME}-${CGAL_TOOLSET}-mt-o" ) - set(CGAL_RelWithDebInfo_MANGLED_NAME "${CGAL_BASENAME}-${CGAL_TOOLSET}-mt-g" ) - - set_target_properties( CGAL PROPERTIES DEBUG_OUTPUT_NAME "${CGAL_Debug_MANGLED_NAME}" - RELEASE_OUTPUT_NAME "${CGAL_Release_MANGLED_NAME}" - MINSIZEREL_OUTPUT_NAME "${CGAL_MinSizeRel_MANGLED_NAME}" - RELWITHDEBINFO_OUTPUT_NAME "${CGAL_RelWithDebInfo_MANGLED_NAME}" - ) - - - set(CGAL_LIBRARY "${CGAL_LIBRARY_FULL_PATH}" CACHE STRING "The CGAL library" FORCE) - set(CGAL_LIBRARY "${CGAL_${CMAKE_BUILD_TYPE}_MANGLED_NAME}") - - if ( HAS_CFG_INTDIR ) - add_custom_command(TARGET CGAL POST_BUILD COMMAND copy /Y \"$(TargetPath)\" \"$(SolutionDir)lib\" ) - add_custom_command(TARGET CGAL POST_BUILD COMMAND if exist \"$(TargetDir)$(TargetName).pdb\" copy /Y \"$(TargetDir)$(TargetName).pdb\" \"$(SolutionDir)lib\" ) - endif() - -endif() - if ( CGAL_INSTALL_LIB_DIR ) install(TARGETS CGAL DESTINATION ${CGAL_INSTALL_LIB_DIR} ) endif() diff --git a/Installation/src/CMakeLists.txt b/Installation/src/CMakeLists.txt index 3e6cc980524..27c35cc1500 100644 --- a/Installation/src/CMakeLists.txt +++ b/Installation/src/CMakeLists.txt @@ -1,4 +1,4 @@ -macro (build_cgal_library LIBRARY_NAME LIBRARY_DIR_NAME ADDITIONAL_FILES) +function (build_cgal_library LIBRARY_NAME LIBRARY_DIR_NAME ADDITIONAL_FILES) # IMPORTANT: First delete all_files.cpp if (EXISTS ${CMAKE_CURRENT_BINARY_DIR}/all_files.cpp) file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/all_files.cpp) @@ -10,7 +10,6 @@ macro (build_cgal_library LIBRARY_NAME LIBRARY_DIR_NAME ADDITIONAL_FILES) list(APPEND CGAL_LIBRARY_SOURCE_FILES ${CGAL_LIBRARY_SOURCE_FILES_TMP}) endforeach() - foreach(source ${CGAL_LIBRARY_SOURCE_FILES}) # It may happen that a file all_files.cpp had been created in-source by # a previous in-source build. We certainly do not want to include that @@ -21,17 +20,42 @@ macro (build_cgal_library LIBRARY_NAME LIBRARY_DIR_NAME ADDITIONAL_FILES) endif() endforeach() -# message(STATUS "Additional files: ${ADDITIONAL_FILES}") add_library (${LIBRARY_NAME} ${CMAKE_CURRENT_BINARY_DIR}/all_files.cpp ${ADDITIONAL_FILES}) # add_library (${LIBRARY_NAME} ${CGAL_LIBRARY_SOURCE_FILES} ${ADDITIONAL_FILES}) # builing not creating temporary all_files.cpp -endmacro() -macro( configure_component DIR COMPONENT ) + if (NOT CGAL_AUTO_LINK_ENABLED ) + get_target_property( ${LIBRARY_NAME}_LIBRARY_FULL_PATH ${LIBRARY_NAME} LOCATION ) + + set(${LIBRARY_NAME}_LIBRARY ${${LIBRARY_NAME}_LIBRARY_FULL_PATH} CACHE STRING "The ${LIBRARY_NAME} library" FORCE) + mark_as_advanced(${LIBRARY_NAME}_LIBRARY) + else(NOT CGAL_AUTO_LINK_ENABLED) + set(${LIBRARY_NAME}_LIBRARY) + + set(${LIBRARY_NAME}_RELEASE_MANGLED_NAME "${LIBRARY_NAME}-${CGAL_TOOLSET}-mt" ) + set(${LIBRARY_NAME}_DEBUG_MANGLED_NAME "${LIBRARY_NAME}-${CGAL_TOOLSET}-mt-gd" ) + set(${LIBRARY_NAME}_MINSIZEREL_MANGLED_NAME "${LIBRARY_NAME}-${CGAL_TOOLSET}-mt-o" ) + set(${LIBRARY_NAME}_RELWITHDEBINFO_MANGLED_NAME "${LIBRARY_NAME}-${CGAL_TOOLSET}-mt-g" ) + + set_target_properties( ${LIBRARY_NAME} PROPERTIES DEBUG_OUTPUT_NAME "${${LIBRARY_NAME}_DEBUG_MANGLED_NAME}" + RELEASE_OUTPUT_NAME "${${LIBRARY_NAME}_RELEASE_MANGLED_NAME}" + MINSIZEREL_OUTPUT_NAME "${${LIBRARY_NAME}_MINSIZEREL_MANGLED_NAME}" + RELWITHDEBINFO_OUTPUT_NAME "${${LIBRARY_NAME}_RELWITHDEBINFO_MANGLED_NAME}" + ) + + if ( HAS_CFG_INTDIR ) + add_custom_command(TARGET ${LIBRARY_NAME} POST_BUILD COMMAND if exist \"$(TargetDir)$(TargetName).dll\" copy /Y \"$(TargetDir)$(TargetName).dll\" \"$(TargetDir)..\" ) + add_custom_command(TARGET ${LIBRARY_NAME} POST_BUILD COMMAND if exist \"$(TargetDir)$(TargetName).pdb\" copy /Y \"$(TargetDir)$(TargetName).pdb\" \"$(TargetDir)..\" ) + add_custom_command(TARGET ${LIBRARY_NAME} POST_BUILD COMMAND if exist \"$(SolutionDir)lib\\$(ConfigurationName)\\$(TargetName).lib\" copy /Y \"$(SolutionDir)lib\\$(ConfigurationName)\\$(TargetName).lib\" \"$(SolutionDir)lib\" ) + endif() + endif(NOT CGAL_AUTO_LINK_ENABLED) +endfunction() + +function( configure_component DIR COMPONENT ) option( WITH_CGAL_${COMPONENT} "Enable CGAL component ${COMPONENT}" ON) if ( WITH_CGAL_${COMPONENT}) add_subdirectory( ${DIR} ${COMPONENT} ) endif() -endmacro() +endfunction() if(COMMAND unset) # Workaround: WITH_CGAL_Core can have been loaded from an old reference @@ -40,6 +64,27 @@ if(COMMAND unset) unset(WITH_CGAL_Core CACHE) endif() +# Output directory of libraries (.so, .dylib, non-static .lib) +set(CGAL_LIBRARIES_DIR ${CMAKE_BINARY_DIR}/lib) +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CGAL_LIBRARIES_DIR}) +# Output directory of static libraries (.a, static .lib) +set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CGAL_LIBRARIES_DIR}) + +# For output directory of DLLs (.dll files) +set(CGAL_RUNTIME_DIR ${CMAKE_BINARY_DIR}/bin) +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CGAL_RUNTIME_DIR}) + +## Prevent use of intermediate directory with MSVC, because we use name +## mangling +#foreach(Conf_type ${CMAKE_CONFIGURATION_TYPES}) +# # Conf_type is Debug, Release, DebWithDebInfo... +# string(TOUPPER ${Conf_type} CONF_TYPE) +# # CONF_TYPE is DEBUG, RELEASE, DEBWITHDEBINFO +# set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_${CONF_TYPE} ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}) +# set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${CONF_TYPE} ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}) +# set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_${CONF_TYPE} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) +#endforeach() + create_CGALconfig_files() set(CGAL_DIR ${CMAKE_BINARY_DIR}) diff --git a/Qt_widget/src/CGALQt3/CMakeLists.txt b/Qt_widget/src/CGALQt3/CMakeLists.txt index ff111d9bbf4..490245c754f 100644 --- a/Qt_widget/src/CGALQt3/CMakeLists.txt +++ b/Qt_widget/src/CGALQt3/CMakeLists.txt @@ -92,38 +92,6 @@ if( QT3_FOUND ) add_definitions( ${CGAL_3RD_PARTY_DEFINITIONS} ${CGAL_Qt3_3RD_PARTY_DEFINITIONS} ) set( CGAL_Qt3_BASENAME CGAL_Qt3 ) - - if (NOT CGAL_AUTO_LINK_ENABLED ) - - set_target_properties( CGAL_Qt3 PROPERTIES OUTPUT_NAME "${CGAL_Qt3_BASENAME}" ) - - get_target_property( CGAL_Qt3_LIBRARY_FULL_PATH CGAL_Qt3 LOCATION ) - - set(CGAL_Qt3_LIBRARY "${CGAL_Qt3_LIBRARY_FULL_PATH}" CACHE STRING "The CGAL_Qt3 library" FORCE) - - mark_as_advanced(CGAL_Qt3_LIBRARY) - - else() - - set(CGAL_Qt3_LIBRARY) - - set(CGAL_Qt3_RELEASE_MANGLED_NAME "${CGAL_Qt3_BASENAME}-${CGAL_TOOLSET}-mt" ) - set(CGAL_Qt3_DEBUG_MANGLED_NAME "${CGAL_Qt3_BASENAME}-${CGAL_TOOLSET}-mt-gd" ) - set(CGAL_Qt3_MINSIZEREL_MANGLED_NAME "${CGAL_Qt3_BASENAME}-${CGAL_TOOLSET}-mt-o" ) - set(CGAL_Qt3_RELWITHDEBINFO_MANGLED_NAME "${CGAL_Qt3_BASENAME}-${CGAL_TOOLSET}-mt-g" ) - - set_target_properties( CGAL_Qt3 PROPERTIES DEBUG_OUTPUT_NAME "${CGAL_Qt3_DEBUG_MANGLED_NAME}" - RELEASE_OUTPUT_NAME "${CGAL_Qt3_RELEASE_MANGLED_NAME}" - MINSIZEREL_OUTPUT_NAME "${CGAL_Qt3_MINSIZEREL_MANGLED_NAME}" - RELWITHDEBINFO_OUTPUT_NAME "${CGAL_Qt3_RELWITHDEBINFO_MANGLED_NAME}" - ) - - if ( HAS_CFG_INTDIR ) - add_custom_command(TARGET CGAL_Qt3 POST_BUILD COMMAND copy /Y \"$(TargetPath)\" \"$(SolutionDir)lib\" ) - add_custom_command(TARGET CGAL_Qt3 POST_BUILD COMMAND if exist \"$(TargetDir)$(TargetName).pdb\" copy /Y \"$(TargetDir)$(TargetName).pdb\" \"$(SolutionDir)lib\" ) - endif() - - endif() if ( CGAL_INSTALL_LIB_DIR ) install(TARGETS CGAL_Qt3 DESTINATION ${CGAL_INSTALL_LIB_DIR} ) From cc0c27f3ed09d068dc96f3c6ce0d91876d9fb1a0 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Tue, 18 Oct 2011 08:23:57 +0000 Subject: [PATCH 53/75] DLLs now may be in $CGAL_DIR/bin --- Testsuite/test/run_testsuite_with_cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Testsuite/test/run_testsuite_with_cmake b/Testsuite/test/run_testsuite_with_cmake index 3eaca731ff0..452a70e588f 100755 --- a/Testsuite/test/run_testsuite_with_cmake +++ b/Testsuite/test/run_testsuite_with_cmake @@ -205,7 +205,7 @@ run_testsuite() case "`uname`" in CYGWIN*) - PATH=`cygpath "$CGAL_DIR"`/lib:$PATH + PATH=`cygpath "$CGAL_DIR"`/bin:`cygpath "$CGAL_DIR"`/lib:$PATH export PATH esac From 4b135885d02293398d33be53c3bc3f9416b07569 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Tue, 18 Oct 2011 13:20:08 +0000 Subject: [PATCH 54/75] I forgot to commit that yesterday --- CGALimageIO/src/CGALImageIO/CMakeLists.txt | 34 ---------------------- 1 file changed, 34 deletions(-) diff --git a/CGALimageIO/src/CGALImageIO/CMakeLists.txt b/CGALimageIO/src/CGALImageIO/CMakeLists.txt index 222b0ca1f88..f3c084d128d 100644 --- a/CGALimageIO/src/CGALImageIO/CMakeLists.txt +++ b/CGALimageIO/src/CGALImageIO/CMakeLists.txt @@ -75,40 +75,6 @@ if(OPENGL_FOUND) target_link_libraries( CGAL_ImageIO ${CGAL_LIBRARY} ${CGAL_3RD_PARTY_LIBRARIES} ${CGAL_ImageIO_3RD_PARTY_LIBRARIES} ) - if (NOT CGAL_AUTO_LINK_ENABLED ) - - set_target_properties( CGAL_ImageIO PROPERTIES OUTPUT_NAME "${CGAL_ImageIO_BASENAME}" ) - - get_target_property( CGAL_ImageIO_LIBRARY_FULL_PATH CGAL_ImageIO LOCATION ) - - set(CGAL_ImageIO_LIBRARY "${CGAL_ImageIO_LIBRARY_FULL_PATH}" CACHE STRING "The CGAL_ImageIO library" FORCE) - - mark_as_advanced(CGAL_ImageIO_LIBRARY) - - target_link_libraries( CGAL_ImageIO ${CGAL_LIBRARY} ) - - else() - - set(CGAL_ImageIO_LIBRARY) - - set(CGAL_ImageIO_RELEASE_MANGLED_NAME "${CGAL_ImageIO_BASENAME}-${CGAL_TOOLSET}-mt" ) - set(CGAL_ImageIO_DEBUG_MANGLED_NAME "${CGAL_ImageIO_BASENAME}-${CGAL_TOOLSET}-mt-gd" ) - set(CGAL_ImageIO_MINSIZEREL_MANGLED_NAME "${CGAL_ImageIO_BASENAME}-${CGAL_TOOLSET}-mt-o" ) - set(CGAL_ImageIO_RELWITHDEBINFO_MANGLED_NAME "${CGAL_ImageIO_BASENAME}-${CGAL_TOOLSET}-mt-g" ) - - set_target_properties( CGAL_ImageIO PROPERTIES DEBUG_OUTPUT_NAME "${CGAL_ImageIO_DEBUG_MANGLED_NAME}" - RELEASE_OUTPUT_NAME "${CGAL_ImageIO_RELEASE_MANGLED_NAME}" - MINSIZEREL_OUTPUT_NAME "${CGAL_ImageIO_MINSIZEREL_MANGLED_NAME}" - RELWITHDEBINFO_OUTPUT_NAME "${CGAL_ImageIO_RELWITHDEBINFO_MANGLED_NAME}" - ) - - if ( HAS_CFG_INTDIR ) - add_custom_command(TARGET CGAL_ImageIO POST_BUILD COMMAND copy /Y \"$(TargetPath)\" \"$(SolutionDir)lib\" ) - add_custom_command(TARGET CGAL_ImageIO POST_BUILD COMMAND if exist \"$(TargetDir)$(TargetName).pdb\" copy /Y \"$(TargetDir)$(TargetName).pdb\" \"$(SolutionDir)lib\" ) - endif() - - endif() - if ( CGAL_INSTALL_LIB_DIR ) install(TARGETS CGAL_ImageIO DESTINATION ${CGAL_INSTALL_LIB_DIR} ) endif() From cabc943d535c453cad3e35cf697c2c3dbffb9189 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Tue, 18 Oct 2011 16:46:54 +0000 Subject: [PATCH 55/75] Missing exports --- Geomview/include/CGAL/IO/Geomview_stream.h | 8 +++++--- Stream_support/include/CGAL/IO/File_header_OFF.h | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Geomview/include/CGAL/IO/Geomview_stream.h b/Geomview/include/CGAL/IO/Geomview_stream.h index b9d3ba957c0..e3b3f222fe1 100644 --- a/Geomview/include/CGAL/IO/Geomview_stream.h +++ b/Geomview/include/CGAL/IO/Geomview_stream.h @@ -31,6 +31,8 @@ #include #include +#include + #include #include #include @@ -40,7 +42,7 @@ namespace CGAL { -class Geomview_stream { +class CGAL_EXPORT Geomview_stream { public: Geomview_stream(const Bbox_3 &bbox = Bbox_3(0,0,0, 1,1,1), const char *machine = NULL, @@ -549,10 +551,10 @@ operator<<(Geomview_stream &gv, const Line_3 &r) } #endif -Geomview_stream& +CGAL_EXPORT Geomview_stream& operator<<(Geomview_stream &gv, const Bbox_2 &bbox); -Geomview_stream& +CGAL_EXPORT Geomview_stream& operator<<(Geomview_stream &gv, const Bbox_3 &bbox); #if defined CGAL_POINT_3_H && !defined CGAL_GV_IN_POINT_3_H diff --git a/Stream_support/include/CGAL/IO/File_header_OFF.h b/Stream_support/include/CGAL/IO/File_header_OFF.h index 179c3a81343..726e3aa3b9a 100644 --- a/Stream_support/include/CGAL/IO/File_header_OFF.h +++ b/Stream_support/include/CGAL/IO/File_header_OFF.h @@ -110,10 +110,10 @@ public: }; // Write header. -std::ostream& operator<<( std::ostream& out, const File_header_OFF& h); +CGAL_EXPORT std::ostream& operator<<( std::ostream& out, const File_header_OFF& h); // Scan header. Marks streams badbit if not in SKEL format nor in OFF. -std::istream& operator>>( std::istream& in, File_header_OFF& h); +CGAL_EXPORT std::istream& operator>>( std::istream& in, File_header_OFF& h); } //namespace CGAL #endif // CGAL_IO_FILE_HEADER_OFF_H // From 338c6a9925ffacc2eccdf366482eae3bc5d0533d Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Tue, 18 Oct 2011 16:53:54 +0000 Subject: [PATCH 56/75] Update the export feature to non-Microsoft compilers Support the ELF visibility feature of gcc/icl/clang --- CGALimageIO/include/CGAL/export/ImageIO.h | 34 +++++++++++-------- Core/include/CGAL/export/CORE.h | 35 +++++++++++-------- GraphicsView/include/CGAL/export/Qt4.h | 34 +++++++++++-------- Installation/include/CGAL/export/CGAL.h | 36 +++++++++++--------- Installation/include/CGAL/export/helpers.h | 39 ++++++++++++++++++++++ 5 files changed, 121 insertions(+), 57 deletions(-) create mode 100644 Installation/include/CGAL/export/helpers.h diff --git a/CGALimageIO/include/CGAL/export/ImageIO.h b/CGALimageIO/include/CGAL/export/ImageIO.h index 8652275baac..01eb5d08618 100755 --- a/CGALimageIO/include/CGAL/export/ImageIO.h +++ b/CGALimageIO/include/CGAL/export/ImageIO.h @@ -20,23 +20,29 @@ #ifndef CGAL_IMAGEIO_EXPORT_H #define CGAL_IMAGEIO_EXPORT_H -#include +#include +#include -#if defined(BOOST_MSVC) && defined(CGAL_BUILD_SHARED_LIBS) +#if defined(CGAL_BUILD_SHARED_LIBS) -#if defined(CGAL_ImageIO_EXPORTS) // add by CMake or in cpp files of the dll -#define CGAL_IMAGEIO_EXPORT __declspec (dllexport) -#define CGAL_IMAGEIO_EXPIMP_TEMPLATE -#else -#define CGAL_IMAGEIO_EXPORT __declspec (dllimport) -#define CGAL_IMAGEIO_EXPIMP_TEMPLATE extern -#endif - -#else +# if defined(CGAL_ImageIO_EXPORTS) // defined by CMake or in cpp files of the dll -#define CGAL_IMAGEIO_EXPORT -#define CGAL_IMAGEIO_EXPIMP_TEMPLATE -#endif +# define CGAL_IMAGEIO_EXPORT CGAL_DLL_EXPORT +# define CGAL_IMAGEIO_EXPIMP_TEMPLATE + +# else // not CGAL_ImageIO_EXPORTS + +# define CGAL_IMAGEIO_EXPORT CGAL_DLL_IMPORT +# define CGAL_IMAGEIO_EXPIMP_TEMPLATE extern + +# endif // not CGAL_IMAGEIO_EXPORTS + +#else // not CGAL_BUILD_SHARED_LIBS + +# define CGAL_IMAGEIO_EXPORT +# define CGAL_IMAGEIO_EXPIMP_TEMPLATE + +#endif // not CGAL_BUILD_SHARED_LIBS #endif // CGAL_IMAGEIO_EXPORT_H diff --git a/Core/include/CGAL/export/CORE.h b/Core/include/CGAL/export/CORE.h index 557115030cc..60a71308938 100755 --- a/Core/include/CGAL/export/CORE.h +++ b/Core/include/CGAL/export/CORE.h @@ -41,22 +41,31 @@ #define CGAL_CORE_EXPORT_H #include +#include -#if defined(BOOST_MSVC) && ( ! defined(CGAL_EXPORTS) ) && defined(CGAL_BUILD_SHARED_LIBS) +// If CGAL_EXPORTS is defined, one are building the CGAL library, and we do +// not want artificial dll-imports of Core symbols (because of +// auto-linking). +#if ( ! defined(CGAL_EXPORTS) ) && defined(CGAL_BUILD_SHARED_LIBS) -#if defined(CGAL_Core_EXPORTS) // add by CMake or in cpp files of the dll -#define CGAL_CORE_EXPORT __declspec (dllexport) -#define CGAL_CORE_EXPIMP_TEMPLATE -#else -#define CGAL_CORE_EXPORT __declspec (dllimport) -#define CGAL_CORE_EXPIMP_TEMPLATE extern -#endif - -#else +# if defined(CGAL_Core_EXPORTS) // defined by CMake or in cpp files of the dll -#define CGAL_CORE_EXPORT -#define CGAL_CORE_EXPIMP_TEMPLATE -#endif +# define CGAL_CORE_EXPORT CGAL_DLL_EXPORT +# define CGAL_CORE_EXPIMP_TEMPLATE + +# else // not CGAL_Core_EXPORTS + +# define CGAL_CORE_EXPORT CGAL_DLL_IMPORT +# define CGAL_CORE_EXPIMP_TEMPLATE extern + +# endif // not CGAL_CORE_EXPORTS + +#else // not CGAL_BUILD_SHARED_LIBS + +# define CGAL_CORE_EXPORT +# define CGAL_CORE_EXPIMP_TEMPLATE + +#endif // not CGAL_BUILD_SHARED_LIBS #endif // CGAL_CORE_EXPORT_H diff --git a/GraphicsView/include/CGAL/export/Qt4.h b/GraphicsView/include/CGAL/export/Qt4.h index 9858913f634..d8ae4fd76fd 100755 --- a/GraphicsView/include/CGAL/export/Qt4.h +++ b/GraphicsView/include/CGAL/export/Qt4.h @@ -16,27 +16,33 @@ // // // Author(s) : Andreas Fabri + #ifndef CGAL_QT4_EXPORT_H #define CGAL_QT4_EXPORT_H -#include #include +#include -#if defined(BOOST_MSVC) && defined(CGAL_BUILD_SHARED_LIBS) +#if defined(CGAL_BUILD_SHARED_LIBS) -#if defined(CGAL_Qt4_EXPORTS) // add by CMake or in cpp files of the dll -#define CGAL_QT4_EXPORT __declspec (dllexport) -#define CGAL_QT4_EXPIMP_TEMPLATE -#else -#define CGAL_QT4_EXPORT __declspec (dllimport) -#define CGAL_QT4_EXPIMP_TEMPLATE extern -#endif - -#else +# if defined(CGAL_Qt4_EXPORTS) // defined by CMake or in cpp files of the dll -#define CGAL_QT4_EXPORT -#define CGAL_QT4_EXPIMP_TEMPLATE -#endif +# define CGAL_QT4_EXPORT CGAL_DLL_EXPORT +# define CGAL_QT4_EXPIMP_TEMPLATE + +# else // not CGAL_Qt4_EXPORTS + +# define CGAL_QT4_EXPORT CGAL_DLL_IMPORT +# define CGAL_QT4_EXPIMP_TEMPLATE extern + +# endif // not CGAL_QT4_EXPORTS + +#else // not CGAL_BUILD_SHARED_LIBS + +# define CGAL_QT4_EXPORT +# define CGAL_QT4_EXPIMP_TEMPLATE + +#endif // not CGAL_BUILD_SHARED_LIBS #endif // CGAL_QT4_EXPORT_H diff --git a/Installation/include/CGAL/export/CGAL.h b/Installation/include/CGAL/export/CGAL.h index ebdc2ce63e2..a31c17de563 100755 --- a/Installation/include/CGAL/export/CGAL.h +++ b/Installation/include/CGAL/export/CGAL.h @@ -20,24 +20,28 @@ #ifndef CGAL_EXPORT_H #define CGAL_EXPORT_H -#include +#include +#include -#if defined(BOOST_MSVC) && defined(CGAL_BUILD_SHARED_LIBS) +#if defined(CGAL_BUILD_SHARED_LIBS) -#if defined(CGAL_EXPORTS) // add by CMake or in cpp files of the dll -#define CGAL_EXPORT __declspec (dllexport) -#define CGAL_EXPIMP_TEMPLATE -#else -#define CGAL_EXPORT __declspec (dllimport) -#define CGAL_EXPIMP_TEMPLATE extern -#endif - -#else +# if defined(CGAL_EXPORTS) // defined by CMake or in cpp files of the dll -#define CGAL_EXPORT -#define CGAL_EXPIMP_TEMPLATE -#endif +# define CGAL_EXPORT CGAL_DLL_EXPORT +# define CGAL_EXPIMP_TEMPLATE + +# else // not CGAL_EXPORTS + +# define CGAL_EXPORT CGAL_DLL_IMPORT +# define CGAL_EXPIMP_TEMPLATE extern + +# endif // not CGAL_EXPORTS + +#else // not CGAL_BUILD_SHARED_LIBS + +# define CGAL_EXPORT +# define CGAL_EXPIMP_TEMPLATE + +#endif // not CGAL_BUILD_SHARED_LIBS #endif // CGAL_EXPORT_H - - diff --git a/Installation/include/CGAL/export/helpers.h b/Installation/include/CGAL/export/helpers.h new file mode 100644 index 00000000000..0c6bd9e5a90 --- /dev/null +++ b/Installation/include/CGAL/export/helpers.h @@ -0,0 +1,39 @@ +// Copyright (c) 2011 GeometryFactory (France). All rights reserved. +// +// This file is part of CGAL (www.cgal.org); you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public License as +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. +// +// Licensees holding a valid commercial license may use this file in +// accordance with the commercial license agreement provided with the software. +// +// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE +// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. +// +// $URL$ +// $Id$ +// +// +// Author(s) : Laurent Rineau + +#ifndef CGAL_EXPORT_HELPERS_H +#define CGAL_EXPORT_HELPERS_H + +#if defined(_WIN32) || defined(__CYGWIN__) +# define CGAL_DLL_IMPORT __declspec(dllimport) +# define CGAL_DLL_EXPORT __declspec(dllexport) +# define CGAL_DLL_LOCAL +#else + #if __GNUC__ >= 4 + #define CGAL_DLL_IMPORT __attribute__ ((visibility ("default"))) + #define CGAL_DLL_EXPORT __attribute__ ((visibility ("default"))) + #define CGAL_DLL_LOCAL __attribute__ ((visibility ("hidden"))) + #else + #define CGAL_DLL_IMPORT + #define CGAL_DLL_EXPORT + #define CGAL_DLL_LOCAL + #endif +#endif + +#endif // CGAL_EXPORT_HELPERS_H From c3b621fc77d8dac0a54b938934244aa683da6e41 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Tue, 18 Oct 2011 16:54:59 +0000 Subject: [PATCH 57/75] Update the documentation about Boost and shared libraries --- .../doc_tex/Installation/installation.tex | 26 +++++++++++++++---- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/Installation/doc_tex/Installation/installation.tex b/Installation/doc_tex/Installation/installation.tex index 7abe1000e66..424140dd647 100644 --- a/Installation/doc_tex/Installation/installation.tex +++ b/Installation/doc_tex/Installation/installation.tex @@ -113,7 +113,7 @@ highly specialized libraries and software for non-geometric issues, e.g. for numeric solvers, or visualization. Note that there is no need to first install all the software -listed below. Only the \stl\ and boost are required by all +listed below. Only the \stl\ and \boost\ are required by all \cgal\ packages. \subsection{Standard Template Library \label{thirdparty:stl}} @@ -127,12 +127,22 @@ or \path+http://msdn.microsoft.com/en-us/library/1fe2x6kt(VS.100).aspx+. The \stl\ comes with the compiler, so there is nothing to install. -\subsection{boost \label{thirdparty:Boost}} +\subsection{Boost \label{thirdparty:Boost}} + +The \boost\ libraries are a set of portable C++ source libraries. Most of +\boost\ libraries are header-only, but a few of them need to be compiled or +installed as binaries. \cgal\ requires the \boost\ libraries. In particular the header files -and the threading library binaries. Version 1.39 (or higher) are needed. +and the threading library (\texttt{Boost.Thread} binaries. Version 1.39 (or +higher) are needed. -In \cgal\ some demos depend on \texttt{Boost.Program\_options}. +On Windows, as auto-linking is used, you also need the binaries of +\texttt{Boost.Serialization} and \texttt{Boost.DateTime}, but the +dependency is artificial and used only a link-time: the CGAL libraries do +not depend on the DLLs of those two libraries. + +In \cgal\ some demos also depend on \texttt{Boost.Program\_options}. In case the \boost\ libraries are not installed on your system already, you can obtain them from \boostpage. For Windows you can download an @@ -558,7 +568,7 @@ This is not an issue for solution/project files, as there the user selects the b Shared libraries ({\tt .dll} on Windows, {\tt .so} on Linux, {\tt .dylib} on MacOS) are built by default. You can choose to produce static libraries instead by setting the \cmake\ variable -{\tt BUILD\_SHARED\_LIBS=FALSE}. If you use \texttt{cmake-gui}, that +\texttt{BUILD\_SHARED\_LIBS} to \texttt{FALSE}. If you use \texttt{cmake-gui}, that variable appears as a checkable option in the graphical user interface. \subsection{Multiple Variants of makefiles}\label{sec:cmake-out-of-source} @@ -925,6 +935,11 @@ variable is enough. If it is not, you can specify the header and library directories individually. You can also provide the full pathname to a specific compiled library if it cannot be found in the library directory or its name is non-standard. +By default, when Boost binary libraries are needed, the shared versions of +them are used, if present. You can set the variable +\texttt{CGAL\_Boost\_USE\_STATIC\_LIBS} to \texttt{ON} if you want to link +with static versions explicitly. + {\ccTexHtml{\small}{} \renewcommand{\arraystretch}{1.3} \gdef\lcTabularBorder{2} @@ -937,6 +952,7 @@ if it cannot be found in the library directory or its name is non-standard. \texttt{BOOST\_LIBRARYDIR} & Idem & Environment\\\hline \texttt{Boost\_{\em (xyz)}\_LIBRARY\_RELEASE} & Full pathname to a release build of the compiled 'xyz' boost library & CMake\\\hline \texttt{Boost\_{\em (xyz)}\_LIBRARY\_DEBUG} & Full pathname to a debug build of the compiled 'xyz' boost library & CMake\\\hline + \texttt{CGAL\_Boost\_USE\_STATIC\_LIBS} & Link with static Boost libraries (Boolean) & CMake\\\hline \end{tabular} } \footnotetext[16]{The environment variable can be spelled either \texttt{BOOST\_ROOT} or \texttt{BOOSTROOT}}\addtocounter{footnote}{1} From 51d34bcd83549c7cafd2d0ec07b8109430748cd8 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Tue, 18 Oct 2011 17:09:37 +0000 Subject: [PATCH 58/75] Visibility features now work also on non-Windows --- .../GlSplat/GlSplat_config.h | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/GlSplat/GlSplat_config.h b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/GlSplat/GlSplat_config.h index 8acb6acbfbf..b64e4065a68 100644 --- a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/GlSplat/GlSplat_config.h +++ b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/GlSplat/GlSplat_config.h @@ -1,14 +1,12 @@ #ifndef GLSPLAT_CONFIG_H #define GLSPLAT_CONFIG_H -#ifdef WIN32 - #ifdef gl_splat_EXPORTS - #define GLSPLAT_EXPORT __declspec(dllexport) - #else - #define GLSPLAT_EXPORT __declspec(dllimport) - #endif -#else // if not Windows - #define GLSPLAT_EXPORT +#include + +#ifdef gl_splat_EXPORTS + #define GLSPLAT_EXPORT CGAL_DLL_EXPORT +#else + #define GLSPLAT_EXPORT CGAL_DLL_IMPORT #endif #endif // GLSPLAT_CONFIG_H From 01e2b6c5e1fcc2b7921891507055dc4e78c2ae5e Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Tue, 18 Oct 2011 17:22:38 +0000 Subject: [PATCH 59/75] typo: "a link-time" -> "at link-time" --- Installation/doc_tex/Installation/installation.tex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Installation/doc_tex/Installation/installation.tex b/Installation/doc_tex/Installation/installation.tex index 43a514cbc39..1ff19e1e5ef 100644 --- a/Installation/doc_tex/Installation/installation.tex +++ b/Installation/doc_tex/Installation/installation.tex @@ -133,7 +133,7 @@ higher) are needed. On Windows, as auto-linking is used, you also need the binaries of \texttt{Boost.Serialization} and \texttt{Boost.DateTime}, but the -dependency is artificial and used only a link-time: the CGAL libraries do +dependency is artificial and used only at link-time: the CGAL libraries do not depend on the DLLs of those two libraries. In \cgal\ some demos also depend on \texttt{Boost.Program\_options}. From c37ce187ff4e5e4c8c96f4672a6058ac6b16b827 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Wed, 19 Oct 2011 15:53:46 +0000 Subject: [PATCH 60/75] Factorize the settings of VERSION/SOVERSION properties of libraries --- CGALimageIO/src/CGALImageIO/CMakeLists.txt | 2 -- Core/src/CGALCore/CMakeLists.txt | 2 -- GraphicsView/src/CGALQt4/CMakeLists.txt | 4 ---- Installation/src/CGAL/CMakeLists.txt | 2 -- Installation/src/CMakeLists.txt | 6 ++++++ Qt_widget/src/CGALQt3/CMakeLists.txt | 4 ---- 6 files changed, 6 insertions(+), 14 deletions(-) diff --git a/CGALimageIO/src/CGALImageIO/CMakeLists.txt b/CGALimageIO/src/CGALImageIO/CMakeLists.txt index f3c084d128d..0497440e926 100644 --- a/CGALimageIO/src/CGALImageIO/CMakeLists.txt +++ b/CGALimageIO/src/CGALImageIO/CMakeLists.txt @@ -71,8 +71,6 @@ if(OPENGL_FOUND) add_definitions( ${CGAL_3RD_PARTY_DEFINITIONS} ${CGAL_ImageIO_3RD_PARTY_DEFINITIONS} ) - set_target_properties(CGAL_ImageIO PROPERTIES VERSION "${CGAL_SOVERSION}" SOVERSION "${CGAL_SONAME_VERSION}") - target_link_libraries( CGAL_ImageIO ${CGAL_LIBRARY} ${CGAL_3RD_PARTY_LIBRARIES} ${CGAL_ImageIO_3RD_PARTY_LIBRARIES} ) if ( CGAL_INSTALL_LIB_DIR ) diff --git a/Core/src/CGALCore/CMakeLists.txt b/Core/src/CGALCore/CMakeLists.txt index fc351564fb5..fb62bc83227 100644 --- a/Core/src/CGALCore/CMakeLists.txt +++ b/Core/src/CGALCore/CMakeLists.txt @@ -28,8 +28,6 @@ add_definitions ( ${CGAL_3RD_PARTY_DEFINITIONS} ) target_link_libraries( CGAL_Core ${CGAL_LIBRARY} ${CGAL_3RD_PARTY_LIBRARIES} ) -set_target_properties(CGAL_Core PROPERTIES VERSION "${CGAL_SOVERSION}" SOVERSION "${CGAL_SONAME_VERSION}") - set( CGAL_Core_BASENAME CGAL_Core ) if ( CGAL_INSTALL_LIB_DIR ) diff --git a/GraphicsView/src/CGALQt4/CMakeLists.txt b/GraphicsView/src/CGALQt4/CMakeLists.txt index a2e7bcdacc5..f9d5a44f4a6 100644 --- a/GraphicsView/src/CGALQt4/CMakeLists.txt +++ b/GraphicsView/src/CGALQt4/CMakeLists.txt @@ -92,10 +92,6 @@ if( QT4_FOUND ) add_definitions( -DCGAL_FAKE_PUBLIC_RELEASE ) endif() - if(CGAL_SOVERSION AND CGAL_SONAME_VERSION) - set_target_properties(CGAL_Qt4 PROPERTIES VERSION "${CGAL_SOVERSION}" SOVERSION "${CGAL_SONAME_VERSION}") - endif() - if ( CGAL_INSTALL_LIB_DIR ) install(TARGETS CGAL_Qt4 DESTINATION ${CGAL_INSTALL_LIB_DIR} ) endif() diff --git a/Installation/src/CGAL/CMakeLists.txt b/Installation/src/CGAL/CMakeLists.txt index 92afae196f9..2235f854b81 100644 --- a/Installation/src/CGAL/CMakeLists.txt +++ b/Installation/src/CGAL/CMakeLists.txt @@ -10,8 +10,6 @@ target_link_libraries(CGAL ${CGAL_3RD_PARTY_LIBRARIES}) set( CGAL_BASENAME CGAL ) -set_target_properties(CGAL PROPERTIES VERSION "${CGAL_SOVERSION}" SOVERSION "${CGAL_SONAME_VERSION}") - if ( CGAL_INSTALL_LIB_DIR ) install(TARGETS CGAL DESTINATION ${CGAL_INSTALL_LIB_DIR} ) endif() diff --git a/Installation/src/CMakeLists.txt b/Installation/src/CMakeLists.txt index 27c35cc1500..24bf00b95f3 100644 --- a/Installation/src/CMakeLists.txt +++ b/Installation/src/CMakeLists.txt @@ -23,6 +23,12 @@ function (build_cgal_library LIBRARY_NAME LIBRARY_DIR_NAME ADDITIONAL_FILES) add_library (${LIBRARY_NAME} ${CMAKE_CURRENT_BINARY_DIR}/all_files.cpp ${ADDITIONAL_FILES}) # add_library (${LIBRARY_NAME} ${CGAL_LIBRARY_SOURCE_FILES} ${ADDITIONAL_FILES}) # builing not creating temporary all_files.cpp + if(CGAL_SOVERSION AND CGAL_SONAME_VERSION) + set_target_properties(${LIBRARY_NAME} PROPERTIES + VERSION "${CGAL_SOVERSION}" + SOVERSION "${CGAL_SONAME_VERSION}") + endif() + if (NOT CGAL_AUTO_LINK_ENABLED ) get_target_property( ${LIBRARY_NAME}_LIBRARY_FULL_PATH ${LIBRARY_NAME} LOCATION ) diff --git a/Qt_widget/src/CGALQt3/CMakeLists.txt b/Qt_widget/src/CGALQt3/CMakeLists.txt index 490245c754f..629054cee6f 100644 --- a/Qt_widget/src/CGALQt3/CMakeLists.txt +++ b/Qt_widget/src/CGALQt3/CMakeLists.txt @@ -83,10 +83,6 @@ if( QT3_FOUND ) add_dependencies( CGAL_Qt3 CGAL ) - if (CGAL_SOVERSION AND CGAL_SONAME_VERSION) - set_target_properties(CGAL_Qt3 PROPERTIES VERSION "${CGAL_SOVERSION}" SOVERSION "${CGAL_SONAME_VERSION}") - endif() - target_link_libraries( CGAL_Qt3 ${CGAL_LIBRARY} ${CGAL_3RD_PARTY_LIBRARIES} ${CGAL_Qt3_3RD_PARTY_LIBRARIES} ) add_definitions( ${CGAL_3RD_PARTY_DEFINITIONS} ${CGAL_Qt3_3RD_PARTY_DEFINITIONS} ) From 529e88e308b2705773ac318f337429da230c7adc Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Thu, 20 Oct 2011 12:32:10 +0000 Subject: [PATCH 61/75] Suppress warning on potential dll linkage problem --- CGALimageIO/include/CGAL/Image_3.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CGALimageIO/include/CGAL/Image_3.h b/CGALimageIO/include/CGAL/Image_3.h index 769a2afbc39..07d6a08d9de 100644 --- a/CGALimageIO/include/CGAL/Image_3.h +++ b/CGALimageIO/include/CGAL/Image_3.h @@ -36,8 +36,9 @@ #if defined(BOOST_MSVC) # pragma warning(push) -# pragma warning(disable:4244) // double float conversion loss of data +# pragma warning(disable:4244 4251) // double float conversion loss of data and dll linkage #endif + class vtkImageData; namespace CGAL { From e6eac9139f36b4ad9e955bfd6d00db1f2d2bb49b Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Thu, 20 Oct 2011 12:43:33 +0000 Subject: [PATCH 62/75] Fix the confusion shared/dynamic libraries --- Installation/doc_tex/Installation/installation.tex | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Installation/doc_tex/Installation/installation.tex b/Installation/doc_tex/Installation/installation.tex index 1ff19e1e5ef..127c7e27b16 100644 --- a/Installation/doc_tex/Installation/installation.tex +++ b/Installation/doc_tex/Installation/installation.tex @@ -558,13 +558,14 @@ your program. This is not an issue for solution/project files, as there the user selects the build type from within the IDE. -\subsection{Static vs.\ Dynamic Libraries } +\subsection{Static vs.\ Shared Libraries } -Shared libraries ({\tt .dll} on Windows, {\tt .so} on Linux, {\tt .dylib} -on MacOS) are built by default. You can choose to produce static libraries -instead by setting the \cmake\ variable -\texttt{BUILD\_SHARED\_LIBS} to \texttt{FALSE}. If you use \texttt{cmake-gui}, that -variable appears as a checkable option in the graphical user interface. +Shared libraries, also called \emph{dynamic-link libraries}, are built by default +({\tt .dll} on Windows, {\tt .so} on Linux, {\tt .dylib} on MacOS). You +can choose to produce static libraries instead by setting the \cmake\ +variable \texttt{BUILD\_SHARED\_LIBS} to \texttt{FALSE}. If you use +\texttt{cmake-gui}, that variable appears as a checkable option in the +graphical user interface. \subsection{Multiple Variants of makefiles}\label{sec:cmake-out-of-source} From 268e5fa464b2dde4ac0b2431132125dd0ee06283 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Thu, 20 Oct 2011 14:49:12 +0000 Subject: [PATCH 63/75] Document that the PATH must be amended --- Installation/changes.html | 15 +++++++++++++++ .../doc_tex/Installation/installation.tex | 5 +++++ 2 files changed, 20 insertions(+) diff --git a/Installation/changes.html b/Installation/changes.html index 2e770e50af9..9e3818e407e 100644 --- a/Installation/changes.html +++ b/Installation/changes.html @@ -105,6 +105,21 @@ Number of lines of code of CGAL

CGAL 3.10 offers the following improvements and new functionality :

+

General

+
    +
  • On Windows, CGAL libraries are now built by default as shared + libraries (also called DLL). To run applications that uses .dll files + of CGAL, you must either copy the .dll files into the directory of + the application, or add the path of the directory that contains those + .dll into the PATH environment variable. +
    • +
  • On Windows, the CMake scripts of CGAL now search for shared version + of the Boost libraries. You must ensure the .dll files of Boost are + found by the dynamic linker. You can, for example, add the path to + the Boost .dll to the PATH environment variable. +
    • +
+

AABB tree

  • Document constness of member functions of the AABB_tree class.
    • diff --git a/Installation/doc_tex/Installation/installation.tex b/Installation/doc_tex/Installation/installation.tex index 127c7e27b16..cd013882023 100644 --- a/Installation/doc_tex/Installation/installation.tex +++ b/Installation/doc_tex/Installation/installation.tex @@ -936,6 +936,11 @@ them are used, if present. You can set the variable \texttt{CGAL\_Boost\_USE\_STATIC\_LIBS} to \texttt{ON} if you want to link with static versions explicitly. +On Windows, if you link with Boost shared libraries, you must ensure that +the \texttt{.dll} files are found by the dynamic linker, at run time. You +can, for example, add the path to the Boost \texttt{.dll} to the +\texttt{PATH} environment variable. + {\ccTexHtml{\small}{} \renewcommand{\arraystretch}{1.3} \gdef\lcTabularBorder{2} From 1e3a953ece5097097e7c4b0dd9eaf5f4a3d416a5 Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Fri, 21 Oct 2011 10:17:46 +0000 Subject: [PATCH 64/75] typo --- Installation/changes.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Installation/changes.html b/Installation/changes.html index 9e3818e407e..18522f063a5 100644 --- a/Installation/changes.html +++ b/Installation/changes.html @@ -108,15 +108,15 @@ CGAL 3.10 offers the following improvements and new functionality :

    General

    • On Windows, CGAL libraries are now built by default as shared - libraries (also called DLL). To run applications that uses .dll files + libraries (also called DLL). To run applications that use .dll files of CGAL, you must either copy the .dll files into the directory of the application, or add the path of the directory that contains those - .dll into the PATH environment variable. + .dll filesinto the PATH environment variable.
    • On Windows, the CMake scripts of CGAL now search for shared version - of the Boost libraries. You must ensure the .dll files of Boost are + of the Boost libraries. You must ensure that the .dll files of Boost are found by the dynamic linker. You can, for example, add the path to - the Boost .dll to the PATH environment variable. + the Boost .dll files to the PATH environment variable.
    From cb2d3bbd649c3ff9ea347245f377a9843d87f51a Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Fri, 21 Oct 2011 10:49:38 +0000 Subject: [PATCH 65/75] Disable the warning about dll-interface needed for std::ofstream members of Log::State --- Kinetic_data_structures/include/CGAL/Tools/Log.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Kinetic_data_structures/include/CGAL/Tools/Log.h b/Kinetic_data_structures/include/CGAL/Tools/Log.h index cd1a1e61df3..60bbb8e8028 100644 --- a/Kinetic_data_structures/include/CGAL/Tools/Log.h +++ b/Kinetic_data_structures/include/CGAL/Tools/Log.h @@ -26,6 +26,13 @@ #include #include +#if defined(BOOST_MSVC) +// Disable the warning about dll-interface needed for std::ofstream members +// of Log::State. +# pragma warning(push) +# pragma warning(disable:4251) +#endif + namespace CGAL { class Log @@ -151,4 +158,11 @@ struct Set_log_state{ }; } //namespace CGAL + +#if defined(BOOST_MSVC) +# pragma warning(pop) #endif + +#endif + + From a49a4976a26f5e1a7303f7666ab9f2dc8d12ff69 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Fri, 21 Oct 2011 14:10:52 +0000 Subject: [PATCH 66/75] Change the name mangling of CGAL libraries, on Windows We adopt the naming scheme of Boost libraries, with the "lib" prefix for static libraries. And with the CGAL_VERSION as suffix. For example, static libraries will be named: libCGAL_Qt4-vc100-mt-gd-3.10-Ic-123.lib and DLL will be named: CGAL_Qt4-vc100-mt-gd-3.10-Ic-123.dll --- .../include/CGAL/auto_link/auto_link.h | 153 ++++++++++++++---- Installation/src/CMakeLists.txt | 15 +- 2 files changed, 135 insertions(+), 33 deletions(-) diff --git a/Installation/include/CGAL/auto_link/auto_link.h b/Installation/include/CGAL/auto_link/auto_link.h index 680688e58da..34a5dfcfc8f 100644 --- a/Installation/include/CGAL/auto_link/auto_link.h +++ b/Installation/include/CGAL/auto_link/auto_link.h @@ -1,5 +1,5 @@ // This header file is a copy of "boost/config/auto_link.hpp" -// from boost version 1.33.1 +// from boost version 1.44.0 // but slightly modified to accomodate CGAL libraries. //-------------------------------------------------------------------------------------- // @@ -35,10 +35,14 @@ Before including this header you must define one or more of define the following CGAL_LIB_NAME: Required: A string containing the basename of the library, for example boost_regex. CGAL_LIB_TOOLSET: Optional: the base name of the toolset. +CGAL_BUILD_SHARED_LIBS: Optional: when set link to dll rather than static library. CGAL_LIB_DIAGNOSTIC: Optional: when set the header will print out the name of the library selected (useful for debugging). CGAL_AUTO_LINK_NOMANGLE: Specifies that we should link to CGAL_LIB_NAME.lib, rather than a mangled-name version. +CGAL_AUTO_LINK_TAGGED: Specifies that we link to libraries built with the --layout=tagged option. + This is essentially the same as the default name-mangled version, but without + the compiler name and version, or the Boost version. Just the build options. ALL these macros will be undef'ed at the end of the header, even though they are defined from the outside. That means you must always define them before including this. @@ -54,14 +58,19 @@ Libraries for Borland and Microsoft compilers are automatically selected here, the name of the lib is selected according to the following formula: -CGAL_LIB_NAME +CGAL_LIB_PREFIX + + CGAL_LIB_NAME + "_" + CGAL_LIB_TOOLSET + CGAL_LIB_THREAD_OPT + CGAL_LIB_RT_OPT + "-" + + CGAL_VERSION These are defined as: +CGAL_LIB_PREFIX: "lib" for static libraries otherwise "". + CGAL_LIB_NAME: The base name of the lib ( for example boost_regex). CGAL_LIB_TOOLSET: The compiler toolset name (vc71, vc80 etc). @@ -73,10 +82,14 @@ CGAL_LIB_RT_OPT: A suffix that indicates the runtime library used, a hiphen: s static runtime (dynamic if not present). + g debug/diagnostic runtime (release if not present). + y Python debug/diagnostic runtime (release if not present). d debug build (release if not present). g debug/diagnostic runtime (release if not present). p STLPort Build. +CGAL_VERSION: Defined in + ***************************************************************************/ @@ -91,7 +104,7 @@ CGAL_LIB_RT_OPT: A suffix that indicates the runtime library used, // C language compatability (no, honestly) // # define BOOST_MSVC _MSC_VER -# define BOOST_STRINGIZEIZE(X) BOOST_DO_STRINGIZE(X) +# define BOOST_STRINGIZE(X) BOOST_DO_STRINGIZE(X) # define BOOST_DO_STRINGIZE(X) #X #endif // @@ -102,6 +115,10 @@ CGAL_LIB_RT_OPT: A suffix that indicates the runtime library used, || (defined(__MWERKS__) && defined(_WIN32) && (__MWERKS__ >= 0x3000)) \ || (defined(__ICL) && defined(_MSC_EXTENSIONS) && (_MSC_VER >= 1200)) +#ifndef CGAL_VERSION +# include +#endif + #ifndef CGAL_LIB_NAME # error "Macro CGAL_LIB_NAME not set (internal error)" #endif @@ -118,10 +135,16 @@ CGAL_LIB_RT_OPT: A suffix that indicates the runtime library used, // select toolset if not defined already: // #ifndef CGAL_LIB_TOOLSET -#if defined(BOOST_MSVC) && (BOOST_MSVC == 1200) +// Note: no compilers before 1200 are supported +#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300) - // vc6: -# define CGAL_LIB_TOOLSET "vc6" +# ifdef UNDER_CE + // vc6: +# define CGAL_LIB_TOOLSET "evc4" +# else + // vc6: +# define CGAL_LIB_TOOLSET "vc6" +# endif #elif defined(BOOST_MSVC) && (BOOST_MSVC == 1300) @@ -186,8 +209,16 @@ CGAL_LIB_RT_OPT: A suffix that indicates the runtime library used, # if (defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION)) && (defined(_STLP_OWN_IOSTREAMS) || defined(__STL_OWN_IOSTREAMS)) -# if defined(_DEBUG) && (defined(__STL_DEBUG) || defined(_STLP_DEBUG)) +# if defined(_DEBUG) && (defined(__STL_DEBUG) || defined(_STLP_DEBUG))\ + && defined(CGAL_DEBUG_PYTHON) && defined(CGAL_LINKING_PYTHON) +# define CGAL_LIB_RT_OPT "-gydp" +# elif defined(_DEBUG) && (defined(__STL_DEBUG) || defined(_STLP_DEBUG)) # define CGAL_LIB_RT_OPT "-gdp" +# elif defined(_DEBUG)\ + && defined(CGAL_DEBUG_PYTHON) && defined(CGAL_LINKING_PYTHON) +# define CGAL_LIB_RT_OPT "-gydp" +# pragma message("warning: STLPort debug versions are built with /D_STLP_DEBUG=1") +# error "Build options aren't compatible with pre-built libraries" # elif defined(_DEBUG) # define CGAL_LIB_RT_OPT "-gdp" # pragma message("warning: STLPort debug versions are built with /D_STLP_DEBUG=1") @@ -198,8 +229,16 @@ CGAL_LIB_RT_OPT: A suffix that indicates the runtime library used, # elif defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION) -# if defined(_DEBUG) && (defined(__STL_DEBUG) || defined(_STLP_DEBUG)) +# if defined(_DEBUG) && (defined(__STL_DEBUG) || defined(_STLP_DEBUG))\ + && defined(CGAL_DEBUG_PYTHON) && defined(CGAL_LINKING_PYTHON) +# define CGAL_LIB_RT_OPT "-gydpn" +# elif defined(_DEBUG) && (defined(__STL_DEBUG) || defined(_STLP_DEBUG)) # define CGAL_LIB_RT_OPT "-gdpn" +# elif defined(_DEBUG)\ + && defined(CGAL_DEBUG_PYTHON) && defined(CGAL_LINKING_PYTHON) +# define CGAL_LIB_RT_OPT "-gydpn" +# pragma message("warning: STLPort debug versions are built with /D_STLP_DEBUG=1") +# error "Build options aren't compatible with pre-built libraries" # elif defined(_DEBUG) # define CGAL_LIB_RT_OPT "-gdpn" # pragma message("warning: STLPort debug versions are built with /D_STLP_DEBUG=1") @@ -210,7 +249,9 @@ CGAL_LIB_RT_OPT: A suffix that indicates the runtime library used, # else -# if defined(_DEBUG) +# if defined(_DEBUG) && defined(CGAL_DEBUG_PYTHON) && defined(CGAL_LINKING_PYTHON) +# define CGAL_LIB_RT_OPT "-gyd" +# elif defined(_DEBUG) # define CGAL_LIB_RT_OPT "-gd" # else # define CGAL_LIB_RT_OPT @@ -222,8 +263,16 @@ CGAL_LIB_RT_OPT: A suffix that indicates the runtime library used, # if (defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION)) && (defined(_STLP_OWN_IOSTREAMS) || defined(__STL_OWN_IOSTREAMS)) -# if defined(_DEBUG) && (defined(__STL_DEBUG) || defined(_STLP_DEBUG)) +# if defined(_DEBUG) && (defined(__STL_DEBUG) || defined(_STLP_DEBUG))\ + && defined(CGAL_DEBUG_PYTHON) && defined(CGAL_LINKING_PYTHON) +# define CGAL_LIB_RT_OPT "-sgydp" +# elif defined(_DEBUG) && (defined(__STL_DEBUG) || defined(_STLP_DEBUG)) # define CGAL_LIB_RT_OPT "-sgdp" +# elif defined(_DEBUG)\ + && defined(CGAL_DEBUG_PYTHON) && defined(CGAL_LINKING_PYTHON) +# define CGAL_LIB_RT_OPT "-sgydp" +# pragma message("warning: STLPort debug versions are built with /D_STLP_DEBUG=1") +# error "Build options aren't compatible with pre-built libraries" # elif defined(_DEBUG) # define CGAL_LIB_RT_OPT "-sgdp" # pragma message("warning: STLPort debug versions are built with /D_STLP_DEBUG=1") @@ -234,8 +283,16 @@ CGAL_LIB_RT_OPT: A suffix that indicates the runtime library used, # elif defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION) -# if defined(_DEBUG) && (defined(__STL_DEBUG) || defined(_STLP_DEBUG)) +# if defined(_DEBUG) && (defined(__STL_DEBUG) || defined(_STLP_DEBUG))\ + && defined(CGAL_DEBUG_PYTHON) && defined(CGAL_LINKING_PYTHON) +# define CGAL_LIB_RT_OPT "-sgydpn" +# elif defined(_DEBUG) && (defined(__STL_DEBUG) || defined(_STLP_DEBUG)) # define CGAL_LIB_RT_OPT "-sgdpn" +# elif defined(_DEBUG)\ + && defined(CGAL_DEBUG_PYTHON) && defined(CGAL_LINKING_PYTHON) +# define CGAL_LIB_RT_OPT "-sgydpn" +# pragma message("warning: STLPort debug versions are built with /D_STLP_DEBUG=1") +# error "Build options aren't compatible with pre-built libraries" # elif defined(_DEBUG) # define CGAL_LIB_RT_OPT "-sgdpn" # pragma message("warning: STLPort debug versions are built with /D_STLP_DEBUG=1") @@ -246,7 +303,10 @@ CGAL_LIB_RT_OPT: A suffix that indicates the runtime library used, # else -# if defined(_DEBUG) +# if defined(_DEBUG)\ + && defined(CGAL_DEBUG_PYTHON) && defined(CGAL_LINKING_PYTHON) +# define CGAL_LIB_RT_OPT "-sgyd" +# elif defined(_DEBUG) # define CGAL_LIB_RT_OPT "-sgd" # else # define CGAL_LIB_RT_OPT "-s" @@ -273,16 +333,26 @@ CGAL_LIB_RT_OPT: A suffix that indicates the runtime library used, # ifdef _RTLDLL -# ifdef CGAL_BORLAND_DEBUG +# if defined(CGAL_BORLAND_DEBUG)\ + && defined(CGAL_DEBUG_PYTHON) && defined(CGAL_LINKING_PYTHON) +# define CGAL_LIB_RT_OPT "-yd" +# elif defined(CGAL_BORLAND_DEBUG) # define CGAL_LIB_RT_OPT "-d" +# elif defined(CGAL_DEBUG_PYTHON) && defined(CGAL_LINKING_PYTHON) +# define CGAL_LIB_RT_OPT -y # else # define CGAL_LIB_RT_OPT # endif # else -# ifdef CGAL_BORLAND_DEBUG +# if defined(CGAL_BORLAND_DEBUG)\ + && defined(CGAL_DEBUG_PYTHON) && defined(CGAL_LINKING_PYTHON) +# define CGAL_LIB_RT_OPT "-syd" +# elif defined(CGAL_BORLAND_DEBUG) # define CGAL_LIB_RT_OPT "-sd" +# elif defined(CGAL_DEBUG_PYTHON) && defined(CGAL_LINKING_PYTHON) +# define CGAL_LIB_RT_OPT "-sy" # else # define CGAL_LIB_RT_OPT "-s" # endif @@ -291,23 +361,42 @@ CGAL_LIB_RT_OPT: A suffix that indicates the runtime library used, #endif +// +// select linkage opt: +// +#if (defined(_DLL) || defined(_RTLDLL)) && defined(CGAL_BUILD_SHARED_LIBS) +# define CGAL_LIB_PREFIX +#elif defined(CGAL_BUILD_SHARED_LIBS) +# error "Mixing a dll CGAL library with a static runtime is a really bad idea..." +#else +# define CGAL_LIB_PREFIX "lib" +#endif + // // now include the lib: // #if defined(CGAL_LIB_NAME) \ + && defined(CGAL_LIB_PREFIX) \ && defined(CGAL_LIB_TOOLSET) \ && defined(CGAL_LIB_THREAD_OPT) \ && defined(CGAL_LIB_RT_OPT) \ + && defined(CGAL_VERSION) -#ifndef CGAL_AUTO_LINK_NOMANGLE -# define CGAL_LIB_FULL_NAME BOOST_STRINGIZE(CGAL_LIB_NAME) "-" CGAL_LIB_TOOLSET CGAL_LIB_THREAD_OPT CGAL_LIB_RT_OPT ".lib" +#ifdef CGAL_AUTO_LINK_TAGGED +# pragma commentcomment(lib, CGAL_LIB_PREFIX BOOST_STRINGIZE(CGAL_LIB_NAME) CGAL_LIB_THREAD_OPT CGAL_LIB_RT_OPT ".lib") +# ifdef CGAL_LIB_DIAGNOSTIC +# pragma message ("Linking to lib file: " CGAL_LIB_PREFIX BOOST_STRINGIZE(CGAL_LIB_NAME) "-" CGAL_LIB_TOOLSET CGAL_LIB_THREAD_OPT CGAL_LIB_RT_OPT "-" BOOST_STRINGIZE(CGAL_VERSION) ".lib") +# endif +#elif defined(CGAL_AUTO_LINK_NOMANGLE) +# pragma comment(lib, BOOST_STRINGIZE(CGAL_LIB_NAME) ".lib") +# ifdef CGAL_LIB_DIAGNOSTIC +# pragma message ("Linking to lib file: " BOOST_STRINGIZE(CGAL_LIB_NAME) ".lib") +# endif #else -# define CGAL_LIB_FULL_NAME BOOST_STRINGIZE(CGAL_LIB_NAME) ".lib" -#endif - -#pragma comment(lib, CGAL_LIB_FULL_NAME ) -#ifdef CGAL_LIB_DIAGNOSTIC -# pragma message ("(CGAL auto-link diagnostic) Linking to lib file: " CGAL_LIB_FULL_NAME ) +# pragma comment(lib, CGAL_LIB_PREFIX BOOST_STRINGIZE(CGAL_LIB_NAME) "-" CGAL_LIB_TOOLSET CGAL_LIB_THREAD_OPT CGAL_LIB_RT_OPT "-" BOOST_STRINGIZE(CGAL_VERSION) ".lib") +# ifdef CGAL_LIB_DIAGNOSTIC +# pragma message ("Linking to lib file: " CGAL_LIB_PREFIX BOOST_STRINGIZE(CGAL_LIB_NAME) "-" CGAL_LIB_TOOLSET CGAL_LIB_THREAD_OPT CGAL_LIB_RT_OPT "-" BOOST_STRINGIZE(CGAL_VERSION) ".lib") +# endif #endif #else @@ -322,12 +411,17 @@ CGAL_LIB_RT_OPT: A suffix that indicates the runtime library used, // // finally undef any macros we may have set: // +#ifdef CGAL_LIB_PREFIX +# undef CGAL_LIB_PREFIX +#endif #if defined(CGAL_LIB_NAME) # undef CGAL_LIB_NAME #endif -#if defined(CGAL_LIB_TOOLSET) -# undef CGAL_LIB_TOOLSET -#endif +// Don't undef this one: it can be set by the user and should be the +// same for all libraries: +//#if defined(CGAL_LIB_TOOLSET) +//# undef CGAL_LIB_TOOLSET +//#endif #if defined(CGAL_LIB_THREAD_OPT) # undef CGAL_LIB_THREAD_OPT #endif @@ -337,9 +431,12 @@ CGAL_LIB_RT_OPT: A suffix that indicates the runtime library used, #if defined(CGAL_LIB_LINK_OPT) # undef CGAL_LIB_LINK_OPT #endif +#if defined(CGAL_LIB_DEBUG_OPT) +# undef CGAL_LIB_DEBUG_OPT +#endif +#if defined(CGAL_DYN_LINK) +# undef CGAL_DYN_LINK +#endif #if defined(CGAL_AUTO_LINK_NOMANGLE) # undef CGAL_AUTO_LINK_NOMANGLE #endif -#if defined(CGAL_LIB_FULL_NAME) -# undef CGAL_LIB_FULL_NAME -#endif diff --git a/Installation/src/CMakeLists.txt b/Installation/src/CMakeLists.txt index 24bf00b95f3..7713c1fdc32 100644 --- a/Installation/src/CMakeLists.txt +++ b/Installation/src/CMakeLists.txt @@ -36,11 +36,16 @@ function (build_cgal_library LIBRARY_NAME LIBRARY_DIR_NAME ADDITIONAL_FILES) mark_as_advanced(${LIBRARY_NAME}_LIBRARY) else(NOT CGAL_AUTO_LINK_ENABLED) set(${LIBRARY_NAME}_LIBRARY) - - set(${LIBRARY_NAME}_RELEASE_MANGLED_NAME "${LIBRARY_NAME}-${CGAL_TOOLSET}-mt" ) - set(${LIBRARY_NAME}_DEBUG_MANGLED_NAME "${LIBRARY_NAME}-${CGAL_TOOLSET}-mt-gd" ) - set(${LIBRARY_NAME}_MINSIZEREL_MANGLED_NAME "${LIBRARY_NAME}-${CGAL_TOOLSET}-mt-o" ) - set(${LIBRARY_NAME}_RELWITHDEBINFO_MANGLED_NAME "${LIBRARY_NAME}-${CGAL_TOOLSET}-mt-g" ) + if(CGAL_BUILD_SHARED_LIBS) + set(CGAL_LIB_PREFIX "lib") + else() + set(CGAL_LIB_PREFIX "") + endif() + + set(${LIBRARY_NAME}_RELEASE_MANGLED_NAME "${CGAL_LIB_PREFIX}${LIBRARY_NAME}-${CGAL_TOOLSET}-mt-${CGAL_VERSION}" ) + set(${LIBRARY_NAME}_DEBUG_MANGLED_NAME "${CGAL_LIB_PREFIX}${LIBRARY_NAME}-${CGAL_TOOLSET}-mt-gd-${CGAL_VERSION}" ) + set(${LIBRARY_NAME}_MINSIZEREL_MANGLED_NAME "${CGAL_LIB_PREFIX}${LIBRARY_NAME}-${CGAL_TOOLSET}-mt-o-${CGAL_VERSION}" ) + set(${LIBRARY_NAME}_RELWITHDEBINFO_MANGLED_NAME "${CGAL_LIB_PREFIX}${LIBRARY_NAME}-${CGAL_TOOLSET}-mt-g-${CGAL_VERSION}" ) set_target_properties( ${LIBRARY_NAME} PROPERTIES DEBUG_OUTPUT_NAME "${${LIBRARY_NAME}_DEBUG_MANGLED_NAME}" RELEASE_OUTPUT_NAME "${${LIBRARY_NAME}_RELEASE_MANGLED_NAME}" From fcc0874c597e7c2b28d5d86e308ed4c387a82956 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Fri, 21 Oct 2011 14:44:53 +0000 Subject: [PATCH 67/75] Do NOT include CGAL_INCLUDE_DIRS before! We want, for example, to have CMAKE_BINARY_DIR/include before those dirs. --- Installation/cmake/modules/UseCGAL.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Installation/cmake/modules/UseCGAL.cmake b/Installation/cmake/modules/UseCGAL.cmake index 443a5b4b2d6..0f134c1c3d0 100644 --- a/Installation/cmake/modules/UseCGAL.cmake +++ b/Installation/cmake/modules/UseCGAL.cmake @@ -47,7 +47,7 @@ if(NOT USE_CGAL_FILE_INCLUDED) #message (STATUS "LIB: ${CGAL_LIBRARY}") #message (STATUS "LIBS: ${CGAL_LIBRARIES}") - include_directories ( BEFORE ${CGAL_INCLUDE_DIRS} ${CGAL_3RD_PARTY_INCLUDE_DIRS} ) + include_directories ( ${CGAL_INCLUDE_DIRS} ${CGAL_3RD_PARTY_INCLUDE_DIRS} ) add_definitions ( ${CGAL_3RD_PARTY_DEFINITIONS} ${CGAL_DEFINITIONS} ) link_directories ( ${CGAL_LIBRARIES_DIR} ${CGAL_3RD_PARTY_LIBRARIES_DIRS} ) From a136c46405a9fbe7b6d0e2613706b1a83f169b84 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Fri, 21 Oct 2011 14:46:12 +0000 Subject: [PATCH 68/75] Fix previous commit about new name mangling for Windows libraries --- Installation/CMakeLists.txt | 3 +++ Installation/src/CMakeLists.txt | 14 +++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Installation/CMakeLists.txt b/Installation/CMakeLists.txt index 79fbb36b25e..e0b5f83901e 100644 --- a/Installation/CMakeLists.txt +++ b/Installation/CMakeLists.txt @@ -116,6 +116,8 @@ if ( CGAL_BRANCH_BUILD ) #define CGAL_VERSION 3.5-I-135 message(STATUS "CGAL_VERSION is ${CGAL_CREATED_VERSION}") + set(CGAL_FULL_VERSION ${CGAL_CREATED_VERSION}) + #define CGAL_VERSION_NR 1030500135 string (LENGTH "${CGAL_MAJOR_VERSION}" CGAL_MAJOR_LEN) @@ -226,6 +228,7 @@ else() # file( READ "${CMAKE_SOURCE_DIR}/VERSION" CGAL_VERSION ) + set(CGAL_FULL_VERSION ${CGAL_VERSION}) string( REPLACE "-" "." CGAL_VERSION_TOKENS1 ${CGAL_VERSION} ) string( REPLACE "." ";" CGAL_VERSION_TOKENS ${CGAL_VERSION_TOKENS1} ) list( LENGTH CGAL_VERSION_TOKENS CGAL_VERSION_TOKENS_LEN ) diff --git a/Installation/src/CMakeLists.txt b/Installation/src/CMakeLists.txt index 7713c1fdc32..e08392ea04d 100644 --- a/Installation/src/CMakeLists.txt +++ b/Installation/src/CMakeLists.txt @@ -37,15 +37,15 @@ function (build_cgal_library LIBRARY_NAME LIBRARY_DIR_NAME ADDITIONAL_FILES) else(NOT CGAL_AUTO_LINK_ENABLED) set(${LIBRARY_NAME}_LIBRARY) if(CGAL_BUILD_SHARED_LIBS) - set(CGAL_LIB_PREFIX "lib") - else() set(CGAL_LIB_PREFIX "") - endif() + else() + set(CGAL_LIB_PREFIX "lib") + endif() - set(${LIBRARY_NAME}_RELEASE_MANGLED_NAME "${CGAL_LIB_PREFIX}${LIBRARY_NAME}-${CGAL_TOOLSET}-mt-${CGAL_VERSION}" ) - set(${LIBRARY_NAME}_DEBUG_MANGLED_NAME "${CGAL_LIB_PREFIX}${LIBRARY_NAME}-${CGAL_TOOLSET}-mt-gd-${CGAL_VERSION}" ) - set(${LIBRARY_NAME}_MINSIZEREL_MANGLED_NAME "${CGAL_LIB_PREFIX}${LIBRARY_NAME}-${CGAL_TOOLSET}-mt-o-${CGAL_VERSION}" ) - set(${LIBRARY_NAME}_RELWITHDEBINFO_MANGLED_NAME "${CGAL_LIB_PREFIX}${LIBRARY_NAME}-${CGAL_TOOLSET}-mt-g-${CGAL_VERSION}" ) + set(${LIBRARY_NAME}_RELEASE_MANGLED_NAME "${CGAL_LIB_PREFIX}${LIBRARY_NAME}-${CGAL_TOOLSET}-mt-${CGAL_FULL_VERSION}" ) + set(${LIBRARY_NAME}_DEBUG_MANGLED_NAME "${CGAL_LIB_PREFIX}${LIBRARY_NAME}-${CGAL_TOOLSET}-mt-gd-${CGAL_FULL_VERSION}" ) + set(${LIBRARY_NAME}_MINSIZEREL_MANGLED_NAME "${CGAL_LIB_PREFIX}${LIBRARY_NAME}-${CGAL_TOOLSET}-mt-o-${CGAL_FULL_VERSION}" ) + set(${LIBRARY_NAME}_RELWITHDEBINFO_MANGLED_NAME "${CGAL_LIB_PREFIX}${LIBRARY_NAME}-${CGAL_TOOLSET}-mt-g-${CGAL_FULL_VERSION}" ) set_target_properties( ${LIBRARY_NAME} PROPERTIES DEBUG_OUTPUT_NAME "${${LIBRARY_NAME}_DEBUG_MANGLED_NAME}" RELEASE_OUTPUT_NAME "${${LIBRARY_NAME}_RELEASE_MANGLED_NAME}" From 13447f666c443c5b082c784f80dd4e650c00e6f8 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Mon, 24 Oct 2011 09:23:21 +0000 Subject: [PATCH 69/75] auto-link files must include includes , that is generated during the build of libraries. CGAL_BUILD_SHARED_LIBS is defined in it. --- GraphicsView/include/CGAL/auto_link/Qt4.h | 2 ++ Installation/include/CGAL/auto_link/CGAL.h | 2 ++ Installation/include/CGAL/auto_link/CGALQt3.h | 2 ++ Installation/include/CGAL/auto_link/CORE.h | 2 ++ Installation/include/CGAL/auto_link/GMP.h | 2 ++ Installation/include/CGAL/auto_link/ImageIO.h | 2 ++ Installation/include/CGAL/auto_link/LAPACK.h | 2 ++ Installation/include/CGAL/auto_link/MPFR.h | 2 ++ Installation/include/CGAL/auto_link/TAUCS.h | 2 ++ 9 files changed, 18 insertions(+) diff --git a/GraphicsView/include/CGAL/auto_link/Qt4.h b/GraphicsView/include/CGAL/auto_link/Qt4.h index b8149769acf..f21b81b7b49 100644 --- a/GraphicsView/include/CGAL/auto_link/Qt4.h +++ b/GraphicsView/include/CGAL/auto_link/Qt4.h @@ -20,6 +20,8 @@ #ifndef CGAL_AUTO_LINK_QT4_H #define CGAL_AUTO_LINK_QT4_H +#include + #ifndef CGAL_NO_AUTOLINK_QT4 #if ( ! defined( CGAL_EXPORTS ) ) && (! defined ( CGAL_Qt4_EXPORTS ) ) diff --git a/Installation/include/CGAL/auto_link/CGAL.h b/Installation/include/CGAL/auto_link/CGAL.h index eb5c1af74d6..09b4e4d69b8 100644 --- a/Installation/include/CGAL/auto_link/CGAL.h +++ b/Installation/include/CGAL/auto_link/CGAL.h @@ -20,6 +20,8 @@ #ifndef CGAL_AUTO_LINK_CGAL_H #define CGAL_AUTO_LINK_CGAL_H +#include + #ifndef CGAL_NO_AUTOLINK_CGAL #ifndef CGAL_EXPORTS // If CGAL_EXPORTS is defined it means that we are building the CGAL diff --git a/Installation/include/CGAL/auto_link/CGALQt3.h b/Installation/include/CGAL/auto_link/CGALQt3.h index 1e24e3b91da..59bdaec42b1 100644 --- a/Installation/include/CGAL/auto_link/CGALQt3.h +++ b/Installation/include/CGAL/auto_link/CGALQt3.h @@ -20,6 +20,8 @@ #ifndef CGAL_AUTO_LINK_CGALQT_H #define CGAL_AUTO_LINK_CGALQT_H +#include + #ifndef CGAL_NO_AUTOLINK_CGALQT #define CGAL_LIB_NAME CGAL_Qt3 diff --git a/Installation/include/CGAL/auto_link/CORE.h b/Installation/include/CGAL/auto_link/CORE.h index 41d92ae009e..c771140cee9 100644 --- a/Installation/include/CGAL/auto_link/CORE.h +++ b/Installation/include/CGAL/auto_link/CORE.h @@ -20,6 +20,8 @@ #ifndef CGAL_AUTO_LINK_CORE_H #define CGAL_AUTO_LINK_CORE_H +#include + #ifndef CGAL_NO_AUTOLINK_CORE #if ( ! defined( CGAL_EXPORTS ) ) && (! defined ( CGAL_Core_EXPORTS ) ) diff --git a/Installation/include/CGAL/auto_link/GMP.h b/Installation/include/CGAL/auto_link/GMP.h index b4b06770e68..14df5d110b3 100644 --- a/Installation/include/CGAL/auto_link/GMP.h +++ b/Installation/include/CGAL/auto_link/GMP.h @@ -20,6 +20,8 @@ #ifndef CGAL_AUTO_LINK_GMP_H #define CGAL_AUTO_LINK_GMP_H +#include + #ifndef CGAL_NO_AUTOLINK_GMP #define CGAL_LIB_NAME gmp diff --git a/Installation/include/CGAL/auto_link/ImageIO.h b/Installation/include/CGAL/auto_link/ImageIO.h index 617f5903f59..b1c7c207396 100644 --- a/Installation/include/CGAL/auto_link/ImageIO.h +++ b/Installation/include/CGAL/auto_link/ImageIO.h @@ -20,6 +20,8 @@ #ifndef CGAL_AUTO_LINK_IMAGEIO_H #define CGAL_AUTO_LINK_IMAGEIO_H +#include + #ifndef CGAL_NO_AUTOLINK_IMAGEIO #if ( ! defined( CGAL_EXPORTS ) ) && (! defined ( CGAL_ImageIO_EXPORTS ) ) diff --git a/Installation/include/CGAL/auto_link/LAPACK.h b/Installation/include/CGAL/auto_link/LAPACK.h index a19b0447640..e1ef7cde33f 100644 --- a/Installation/include/CGAL/auto_link/LAPACK.h +++ b/Installation/include/CGAL/auto_link/LAPACK.h @@ -24,6 +24,8 @@ #ifndef CGAL_AUTO_LINK_LAPACK_H #define CGAL_AUTO_LINK_LAPACK_H +#include + // Skip the whole file if auto-link is off #if !defined(CGAL_NO_AUTOLINK_LAPACK) && !defined(CGAL_NO_AUTOLINK) diff --git a/Installation/include/CGAL/auto_link/MPFR.h b/Installation/include/CGAL/auto_link/MPFR.h index b3e8c3fbd2b..f9796ef9dc5 100644 --- a/Installation/include/CGAL/auto_link/MPFR.h +++ b/Installation/include/CGAL/auto_link/MPFR.h @@ -20,6 +20,8 @@ #ifndef CGAL_AUTO_LINK_MPFR_H #define CGAL_AUTO_LINK_MPFR_H +#include + #ifndef CGAL_NO_AUTOLINK_MPFR #define CGAL_LIB_NAME mpfr diff --git a/Installation/include/CGAL/auto_link/TAUCS.h b/Installation/include/CGAL/auto_link/TAUCS.h index 3b615889098..61ee5d78569 100644 --- a/Installation/include/CGAL/auto_link/TAUCS.h +++ b/Installation/include/CGAL/auto_link/TAUCS.h @@ -24,6 +24,8 @@ #ifndef CGAL_AUTO_LINK_TAUCS_H #define CGAL_AUTO_LINK_TAUCS_H +#include + // Skip the whole file if auto-link is off #if !defined(CGAL_NO_AUTOLINK_TAUCS) && !defined(CGAL_NO_AUTOLINK) From 7c64fe7394021a76a30d7ef25d9db999e45186bf Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Tue, 25 Oct 2011 15:17:08 +0000 Subject: [PATCH 70/75] Add versioninfo to created DLLs. --- .gitattributes | 1 + Installation/CMakeLists.txt | 18 +++++- Installation/config/version.h.in | 2 + Installation/include/CGAL/version.h | 4 +- Installation/include/CGAL/version_macros.h | 47 +++++++++++++++ Installation/src/CGAL_libs_verinfo.rc.in | 68 ++++++++++++++++++++++ Installation/src/CMakeLists.txt | 31 ++++++---- 7 files changed, 156 insertions(+), 15 deletions(-) create mode 100644 Installation/include/CGAL/version_macros.h create mode 100644 Installation/src/CGAL_libs_verinfo.rc.in diff --git a/.gitattributes b/.gitattributes index 5056cb77d03..00631947c87 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1780,6 +1780,7 @@ Installation/doc_tex/Installation/cmakelogo.png -text svneol=unset#image/png Installation/doc_tex/Installation/illustration.png -text Installation/html2textrc -text Installation/include/CGAL/internal/deprecation_warning.h -text +Installation/src/CGAL_libs_verinfo.rc.in -text Installation/src/CMakeLists.txt -text Installation/test/Installation/CMakeLists.txt -text Installation/test/Installation/deprecation_warning.cpp -text diff --git a/Installation/CMakeLists.txt b/Installation/CMakeLists.txt index e0b5f83901e..6bd75b6d28f 100644 --- a/Installation/CMakeLists.txt +++ b/Installation/CMakeLists.txt @@ -99,6 +99,8 @@ if ( CGAL_BRANCH_BUILD ) file(STRINGS "${CGAL_MAINTENANCE_PACKAGE_DIR}/release_building/MINOR_NUMBER" CGAL_MINOR_VERSION REGEX "[0-9]*") file(STRINGS "${CGAL_MAINTENANCE_PACKAGE_DIR}/release_building/BUGFIX_NUMBER" CGAL_BUGFIX_VERSION REGEX "[0-9]*") + set(CGAL_BUILD_VERSION 900) + message( STATUS "Generate VERSION file") file(REMOVE ${CMAKE_BINARY_DIR}/VERSION) if (CGAL_BUGFIX_VERSION AND CGAL_BUGFIX_VERSION GREATER 0) @@ -108,7 +110,7 @@ if ( CGAL_BRANCH_BUILD ) endif() # TODO set number of internal release (replace "000") - set(CGAL_CREATED_VERSION "${CGAL_CREATED_VERSION_NUM}-I-000") + set(CGAL_CREATED_VERSION "${CGAL_CREATED_VERSION_NUM}-I-${CGAL_BUILD_VERSION}") file(WRITE "${CMAKE_BINARY_DIR}/VERSION" "${CGAL_CREATED_VERSION_NUM}") @@ -130,8 +132,17 @@ if ( CGAL_BRANCH_BUILD ) else() set(CGAL_TMP_MINOR "${CGAL_MINOR_VERSION}") endif() - set(CGAL_CREATED_VERSION_NR "1${CGAL_TMP_MAJOR}${CGAL_TMP_MINOR}${CGAL_BUGFIX_VERSION}0000") - message(STATUS "CGAL_VERSION_NR is 1${CGAL_TMP_MAJOR}${CGAL_TMP_MINOR}${CGAL_BUGFIX_VERSION}0000") + + set(CGAL_TMP_BUILD "${CGAL_BUILD_VERSION}") + string(LENGTH "${CGAL_TMP_BUILD}" CGAL_BUILD_LEN) + + while(CGAL_BUILD_LEN LESS 4) + set(CGAL_TMP_BUILD "0${CGAL_TMP_BUILD}") + string(LENGTH "${CGAL_TMP_BUILD}" CGAL_BUILD_LEN) + endwhile() + + set(CGAL_CREATED_VERSION_NR "1${CGAL_TMP_MAJOR}${CGAL_TMP_MINOR}${CGAL_BUGFIX_VERSION}${CGAL_TMP_BUILD}") + message(STATUS "CGAL_VERSION_NR is ${CGAL_CREATED_VERSION_NR}") if ( ${CGAL_SCM_NAME} STREQUAL "svn" ) @@ -236,6 +247,7 @@ else() set(CGAL_MINOR_VERSION) set(CGAL_BUGFIX_VERSION) + set(CGAL_BUILD_VERSION 1000) if ( CGAL_VERSION_TOKENS_LEN GREATER 1 ) list( GET CGAL_VERSION_TOKENS 1 CGAL_MINOR_VERSION ) diff --git a/Installation/config/version.h.in b/Installation/config/version.h.in index 6d7a51b1291..df5f9facac2 100644 --- a/Installation/config/version.h.in +++ b/Installation/config/version.h.in @@ -28,4 +28,6 @@ #define CGAL_VERSION_NR @CGAL_CREATED_VERSION_NR@ #define CGAL_SVN_REVISION @CGAL_CREATED_SVN_REVISION@ +#include + #endif diff --git a/Installation/include/CGAL/version.h b/Installation/include/CGAL/version.h index 5535c766d53..61478351515 100644 --- a/Installation/include/CGAL/version.h +++ b/Installation/include/CGAL/version.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 +// Copyright (c) 2011 // Utrecht University (The Netherlands), // ETH Zurich (Switzerland), // INRIA Sophia-Antipolis (France), @@ -28,4 +28,6 @@ #define CGAL_VERSION_NR 1030900000 #define CGAL_SVN_REVISION 62149 +#include + #endif diff --git a/Installation/include/CGAL/version_macros.h b/Installation/include/CGAL/version_macros.h new file mode 100644 index 00000000000..de6d1eeb21a --- /dev/null +++ b/Installation/include/CGAL/version_macros.h @@ -0,0 +1,47 @@ +// Copyright (c) 2011 +// Utrecht University (The Netherlands), +// ETH Zurich (Switzerland), +// INRIA Sophia-Antipolis (France), +// Max-Planck-Institute Saarbruecken (Germany), +// and Tel-Aviv University (Israel). All rights reserved. +// +// This file is part of CGAL (www.cgal.org); you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public License as +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. +// +// Licensees holding a valid commercial license may use this file in +// accordance with the commercial license agreement provided with the software. +// +// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE +// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. +// +// $URL$ +// $Id$ +// +// +// Author : Laurent Rineau + +#ifndef CGAL_VERSION_MACROS_H +#define CGAL_VERSION_MACROS_H + +#include + +#ifndef CGAL_STR +#define CGAL_STR(X) CGAL_STR_STR(X) +#define CGAL_STR_STR(X) #X +#endif + +#define CGAL_VERSION_STR CGAL_STR(CGAL_VERSION) + +// The following macro definitions: +// - do not use extra parenthesis, +// - and do not use whitespace +// on purpose, so that the Windows Resource Compiler can understand +// the file generated from src/CGAL_libs_verinfo.rc.in +#define CGAL_VERSION_MAJOR (CGAL_VERSION_NR/10000000%100) +#define CGAL_VERSION_MINOR (CGAL_VERSION_NR/100000%100) +#define CGAL_VERSION_PATCH (CGAL_VERSION_NR/10000%10) +#define CGAL_VERSION_BUILD (CGAL_VERSION_NR%10000) + +#endif // CGAL_VERSION_MACROS_H diff --git a/Installation/src/CGAL_libs_verinfo.rc.in b/Installation/src/CGAL_libs_verinfo.rc.in new file mode 100644 index 00000000000..7c9be48f5dd --- /dev/null +++ b/Installation/src/CGAL_libs_verinfo.rc.in @@ -0,0 +1,68 @@ +# if defined(UNDER_CE) +# include +# else +# include +# endif + +// The following is set by CMake +#cmakedefine CGAL_BRANCH_BUILD + +// The values of the following variable are filled by CMake +#define CGAL_LIB_NAME @LIBRARY_NAME@ +#define CGAL_VERSION_MAJOR @CGAL_MAJOR_VERSION@ +#define CGAL_VERSION_MINOR @CGAL_MINOR_VERSION@ +#define CGAL_VERSION_PATCH @CGAL_BUGFIX_VERSION@ +#define CGAL_VERSION_BUILD @CGAL_BUILD_VERSION@ +#ifdef _DEBUG +# define CGAL_LIB_FULLNAME "@DEBUG_MANGLED_NAME@.dll" +#else +# define CGAL_LIB_FULLNAME "@RELEASE_MANGLED_NAME@.dll" +#endif + +#define CGAL_VER_EMPTY_STR "\0" +#define CGAL_VER_xxstr(s) #s +#define CGAL_VER_xstr(s) CGAL_VER_xxstr(s) CGAL_VER_EMPTY_STR +#define CGAL_VER_str(s) CGAL_VER_xstr(s) + +#define CGAL_VER_VERSION CGAL_VERSION_MAJOR,CGAL_VERSION_MINOR,CGAL_VERSION_PATCH,CGAL_VERSION_BUILD +#define CGAL_VER_VERSION_STR CGAL_VER_str(CGAL_VERSION) +#define CGAL_VER_COMPANYNAME_STR "The CGAL Project, http://www.cgal.org/\0" +#define CGAL_VER_FILEDESCRIPTION_STR "@LIBRARY_NAME@ Library\0" +#define CGAL_VER_FILEVERSION_STR CGAL_VER_VERSION_STR +#define CGAL_VER_ORIGINALFILENAME_STR CGAL_LIB_FULLNAME CGAL_VER_EMPTY_STR +#define CGAL_VER_PRODUCTNAME_STR "CGAL\0" +#define CGAL_VER_PRODUCTVERSION_STR CGAL_VER_VERSION_STR + +VS_VERSION_INFO VERSIONINFO + FILEVERSION CGAL_VER_VERSION + PRODUCTVERSION CGAL_VER_VERSION + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS VS_FF_DEBUG +#else + FILEFLAGS 0x0L +#endif + FILEOS VOS__WINDOWS32 + FILETYPE VFT_DLL + FILESUBTYPE 0x0L + BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904E4" + BEGIN + VALUE "CompanyName", CGAL_VER_COMPANYNAME_STR + VALUE "FileDescription", CGAL_VER_FILEDESCRIPTION_STR + VALUE "FileVersion", CGAL_VER_FILEVERSION_STR + VALUE "OriginalFilename", CGAL_VER_ORIGINALFILENAME_STR + VALUE "ProductName", CGAL_VER_PRODUCTNAME_STR + VALUE "ProductVersion", CGAL_VER_PRODUCTVERSION_STR + END + END + + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1252 + END + END +/* End of Version info */ + diff --git a/Installation/src/CMakeLists.txt b/Installation/src/CMakeLists.txt index e08392ea04d..3e140e6515a 100644 --- a/Installation/src/CMakeLists.txt +++ b/Installation/src/CMakeLists.txt @@ -20,8 +20,21 @@ function (build_cgal_library LIBRARY_NAME LIBRARY_DIR_NAME ADDITIONAL_FILES) endif() endforeach() - add_library (${LIBRARY_NAME} ${CMAKE_CURRENT_BINARY_DIR}/all_files.cpp ${ADDITIONAL_FILES}) -# add_library (${LIBRARY_NAME} ${CGAL_LIBRARY_SOURCE_FILES} ${ADDITIONAL_FILES}) # builing not creating temporary all_files.cpp + set(RELEASE_MANGLED_NAME "${CGAL_LIB_PREFIX}${LIBRARY_NAME}-${CGAL_TOOLSET}-mt-${CGAL_FULL_VERSION}" ) + set(DEBUG_MANGLED_NAME "${CGAL_LIB_PREFIX}${LIBRARY_NAME}-${CGAL_TOOLSET}-mt-gd-${CGAL_FULL_VERSION}" ) + + if(CGAL_BUILD_SHARED_LIBS) + configure_file(${CGAL_INSTALLATION_PACKAGE_DIR}/src/CGAL_libs_verinfo.rc.in ${LIBRARY_NAME}_verinfo.rc @ONLY) + set(rc_file ${CMAKE_CURRENT_BINARY_DIR}/${LIBRARY_NAME}_verinfo.rc) + else() + set(rc_file ) + endif() + + add_library (${LIBRARY_NAME} + ${CMAKE_CURRENT_BINARY_DIR}/all_files.cpp + ${rc_file} + ${ADDITIONAL_FILES}) +# add_library (${LIBRARY_NAME} ${CGAL_LIBRARY_SOURCE_FILES} ${rc_file} ${ADDITIONAL_FILES}) # builing not creating temporary all_files.cpp if(CGAL_SOVERSION AND CGAL_SONAME_VERSION) set_target_properties(${LIBRARY_NAME} PROPERTIES @@ -42,15 +55,11 @@ function (build_cgal_library LIBRARY_NAME LIBRARY_DIR_NAME ADDITIONAL_FILES) set(CGAL_LIB_PREFIX "lib") endif() - set(${LIBRARY_NAME}_RELEASE_MANGLED_NAME "${CGAL_LIB_PREFIX}${LIBRARY_NAME}-${CGAL_TOOLSET}-mt-${CGAL_FULL_VERSION}" ) - set(${LIBRARY_NAME}_DEBUG_MANGLED_NAME "${CGAL_LIB_PREFIX}${LIBRARY_NAME}-${CGAL_TOOLSET}-mt-gd-${CGAL_FULL_VERSION}" ) - set(${LIBRARY_NAME}_MINSIZEREL_MANGLED_NAME "${CGAL_LIB_PREFIX}${LIBRARY_NAME}-${CGAL_TOOLSET}-mt-o-${CGAL_FULL_VERSION}" ) - set(${LIBRARY_NAME}_RELWITHDEBINFO_MANGLED_NAME "${CGAL_LIB_PREFIX}${LIBRARY_NAME}-${CGAL_TOOLSET}-mt-g-${CGAL_FULL_VERSION}" ) - - set_target_properties( ${LIBRARY_NAME} PROPERTIES DEBUG_OUTPUT_NAME "${${LIBRARY_NAME}_DEBUG_MANGLED_NAME}" - RELEASE_OUTPUT_NAME "${${LIBRARY_NAME}_RELEASE_MANGLED_NAME}" - MINSIZEREL_OUTPUT_NAME "${${LIBRARY_NAME}_MINSIZEREL_MANGLED_NAME}" - RELWITHDEBINFO_OUTPUT_NAME "${${LIBRARY_NAME}_RELWITHDEBINFO_MANGLED_NAME}" + set_target_properties( ${LIBRARY_NAME} PROPERTIES + OUTPUT_NAME_DEBUG "${DEBUG_MANGLED_NAME}" + OUTPUT_NAME_RELEASE "${RELEASE_MANGLED_NAME}" + OUTPUT_NAME_MINSIZEREL "${RELEASE_MANGLED_NAME}" + OUTPUT_NAME_RELWITHDEBINFO "${RELEASE_MANGLED_NAME}" ) if ( HAS_CFG_INTDIR ) From fc204cd04d06d1a2ebe7e79163e0a6e418b4f55b Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Wed, 26 Oct 2011 09:43:02 +0000 Subject: [PATCH 71/75] Do not create the .rc file if not WIN32 --- Installation/src/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Installation/src/CMakeLists.txt b/Installation/src/CMakeLists.txt index 3e140e6515a..bdf17633ba3 100644 --- a/Installation/src/CMakeLists.txt +++ b/Installation/src/CMakeLists.txt @@ -23,7 +23,7 @@ function (build_cgal_library LIBRARY_NAME LIBRARY_DIR_NAME ADDITIONAL_FILES) set(RELEASE_MANGLED_NAME "${CGAL_LIB_PREFIX}${LIBRARY_NAME}-${CGAL_TOOLSET}-mt-${CGAL_FULL_VERSION}" ) set(DEBUG_MANGLED_NAME "${CGAL_LIB_PREFIX}${LIBRARY_NAME}-${CGAL_TOOLSET}-mt-gd-${CGAL_FULL_VERSION}" ) - if(CGAL_BUILD_SHARED_LIBS) + if(CGAL_BUILD_SHARED_LIBS AND WIN32) configure_file(${CGAL_INSTALLATION_PACKAGE_DIR}/src/CGAL_libs_verinfo.rc.in ${LIBRARY_NAME}_verinfo.rc @ONLY) set(rc_file ${CMAKE_CURRENT_BINARY_DIR}/${LIBRARY_NAME}_verinfo.rc) else() From 5a7b6ace886ea4f30ccd6c22f0e540f4e113baa8 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Wed, 26 Oct 2011 11:24:17 +0000 Subject: [PATCH 72/75] Bug fix: if CGAL_Boost_USE_STATIC_LIBS evaluates to FALSE, one wants to use its value anyway. --- Installation/cmake/modules/CGAL_TweakFindBoost.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Installation/cmake/modules/CGAL_TweakFindBoost.cmake b/Installation/cmake/modules/CGAL_TweakFindBoost.cmake index e67f48a414e..2683b2b3765 100644 --- a/Installation/cmake/modules/CGAL_TweakFindBoost.cmake +++ b/Installation/cmake/modules/CGAL_TweakFindBoost.cmake @@ -25,7 +25,7 @@ # Boost versions, even if the file FindBoost.cmake is old. if( NOT CGAL_TweakFindBoost ) - if(CGAL_Boost_USE_STATIC_LIBS) + if(DEFINED CGAL_Boost_USE_STATIC_LIBS) # If the option is loaded from CGALConfig.h, use its value as default # value. But the user will still have the choice to change the # value. That means that we can build the CGAL libraries using static From 099d46877e491f86632f0833950efeaf9232969a Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Fri, 28 Oct 2011 12:14:01 +0000 Subject: [PATCH 73/75] Bug-fix: really add the "lib" prefix for CGAL lib names on Windows --- Installation/src/CMakeLists.txt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Installation/src/CMakeLists.txt b/Installation/src/CMakeLists.txt index bdf17633ba3..c6a40175b78 100644 --- a/Installation/src/CMakeLists.txt +++ b/Installation/src/CMakeLists.txt @@ -20,6 +20,12 @@ function (build_cgal_library LIBRARY_NAME LIBRARY_DIR_NAME ADDITIONAL_FILES) endif() endforeach() + if(CGAL_BUILD_SHARED_LIBS) + set(CGAL_LIB_PREFIX "") + else() + set(CGAL_LIB_PREFIX "lib") + endif() + set(RELEASE_MANGLED_NAME "${CGAL_LIB_PREFIX}${LIBRARY_NAME}-${CGAL_TOOLSET}-mt-${CGAL_FULL_VERSION}" ) set(DEBUG_MANGLED_NAME "${CGAL_LIB_PREFIX}${LIBRARY_NAME}-${CGAL_TOOLSET}-mt-gd-${CGAL_FULL_VERSION}" ) @@ -49,11 +55,6 @@ function (build_cgal_library LIBRARY_NAME LIBRARY_DIR_NAME ADDITIONAL_FILES) mark_as_advanced(${LIBRARY_NAME}_LIBRARY) else(NOT CGAL_AUTO_LINK_ENABLED) set(${LIBRARY_NAME}_LIBRARY) - if(CGAL_BUILD_SHARED_LIBS) - set(CGAL_LIB_PREFIX "") - else() - set(CGAL_LIB_PREFIX "lib") - endif() set_target_properties( ${LIBRARY_NAME} PROPERTIES OUTPUT_NAME_DEBUG "${DEBUG_MANGLED_NAME}" From f4146d0033ea0ea30005bc3e7def67c0bf66eda8 Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Fri, 28 Oct 2011 14:01:41 +0000 Subject: [PATCH 74/75] update license status --- copyright | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/copyright b/copyright index 7f55f8278ab..f89f4138a44 100644 --- a/copyright +++ b/copyright @@ -28,13 +28,13 @@ R = RU Groningen Circular_kernel_2 I Circular_kernel_3 I Circulator ETIMU - Combinatorial_map Cnrs; Guillaume Damiand will upgrade to LGPL 3+ + Combinatorial_map Cnrs; Guillaume Damiand upgraded Conic_2 ETIMU Convex_decomposition_3 M Convex_hull_2 M Convex_hull_3 M Convex_hull_d M - Core third party lib under QPL; sent mail to Chee Yap + Core NYU; Chee Yap agreed to upgrade Developers_manual ETIMU Distance_2 ETIMU Distance_3 ETIMU @@ -57,7 +57,7 @@ R = RU Groningen Jet_fitting_3 I Kernel_23 ETIMU Kernel_d ETIMU - Kinetic_data_structures Stanfor; Leo Guibas agrees to upgrade + Kinetic_data_structures Stanford; Leo Guibas agreed to upgrade LEDA ETIMU Largest_empty_rect_2 T MacOSX F @@ -103,12 +103,12 @@ R = RU Groningen STL_Extension ETIMU Scripts ETIMU SearchStructures E - Segment_Delaunay_graph_2 I I sent mail to Menelaos to remove Notre Dame U - Skin_surface_3 R sent mail to RUG + Segment_Delaunay_graph_2 I Menelaos removed Notre Dame U + Skin_surface_3 R Gert Vegter agreed to upgrade Snap_rounding_2 T Spatial_searching U Spatial_sorting I - Straight_skeleton_2 Cacciola + Straight_skeleton_2 Cacciola; Fernando agreed to upgrade to GPL Stream_lines_2 I Stream_support ETIMU Subdivision_method_3 G From fbff7f28fdd51e8ae494efc8c27d1fa54fd534a5 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Fri, 13 Jan 2012 12:18:03 +0000 Subject: [PATCH 75/75] updated crontab (automated commit) --- Maintenance/infrastructure/cgal.geometryfactory.com/crontab | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Maintenance/infrastructure/cgal.geometryfactory.com/crontab b/Maintenance/infrastructure/cgal.geometryfactory.com/crontab index ad42eaa1401..bfff11ade2a 100644 --- a/Maintenance/infrastructure/cgal.geometryfactory.com/crontab +++ b/Maintenance/infrastructure/cgal.geometryfactory.com/crontab @@ -18,8 +18,7 @@ # "next" alone 0 21 * * Fri cd $HOME/CGAL/create_internal_release; $HOME/bin/create_release $HOME/CGAL/next --public --do-it # "next" + candidates -0 21 * * Mon,Tue,Wed,Thu,Sun cd $HOME/CGAL/create_internal_release; $HOME/bin/create_release $HOME/CGAL/cgal_dot_dll_GF $HOME/CGAL/candidate-packages --public --do-it -#0 21 * * Mon,Tue,Wed,Thu,Sun cd $HOME/CGAL/create_internal_release; $HOME/bin/create_release $HOME/CGAL/next $HOME/CGAL/candidate-packages --public --do-it +0 21 * * Mon,Tue,Wed,Thu,Sun cd $HOME/CGAL/create_internal_release; $HOME/bin/create_release $HOME/CGAL/next $HOME/CGAL/candidate-packages --public --do-it ### Special test of /branches/features/Result_of-pmoeller today #0 21 * * Mon,Tue,Wed,Thu,Sun cd $HOME/CGAL/create_internal_release; $HOME/bin/create_release $HOME/CGAL/Result_of-pmoeller $HOME/CGAL/candidate-packages --public --do-it