From bff5db68e118973bb108ffbbb2859801edf05e6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Thu, 31 Oct 2019 14:17:20 +0100 Subject: [PATCH] fix some remaining license notice + add a missing LicenseRef-Commercial --- Installation/include/CGAL/auto_link/auto_link.h | 8 +++----- STL_Extension/include/CGAL/is_streamable.h | 9 --------- Surface_mesh/include/CGAL/Surface_mesh/Surface_mesh.h | 2 +- 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/Installation/include/CGAL/auto_link/auto_link.h b/Installation/include/CGAL/auto_link/auto_link.h index c02515b95d9..3f9a015f1bb 100644 --- a/Installation/include/CGAL/auto_link/auto_link.h +++ b/Installation/include/CGAL/auto_link/auto_link.h @@ -1,15 +1,13 @@ // This header file is a copy of "boost/config/auto_link.hpp" // from boost version 1.44.0 // but slightly modified to accommodate CGAL libraries. - +// // Before CGAL-4.7-beta1, it has been synchronized with // libs/config/ version boost-1.58.0-39-g15d56c9, file // include/boost/config/auto_link.hpp - +// // (C) Copyright John Maddock 2003. -// Use, modification and distribution are subject to the -// Boost Software License, Version 1.0. (See accompanying file -// LICENSE_1_0.txt or copy at https://www.boost.org/LICENSE_1_0.txt) +// // // $URL$ // $Id$ diff --git a/STL_Extension/include/CGAL/is_streamable.h b/STL_Extension/include/CGAL/is_streamable.h index b19ff487c4e..b20898a2664 100644 --- a/STL_Extension/include/CGAL/is_streamable.h +++ b/STL_Extension/include/CGAL/is_streamable.h @@ -1,15 +1,6 @@ // Copyright (c) 2012 GeometryFactory Sarl (France) // All rights reserved. // -// Distributed under the Boost Software License, Version 1.0. (See accompanying -// file LICENSE_1_0.txt or copy at https://www.boost.org/LICENSE_1_0.txt) -// -// 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$ // SPDX-License-Identifier: BSL-1.0 diff --git a/Surface_mesh/include/CGAL/Surface_mesh/Surface_mesh.h b/Surface_mesh/include/CGAL/Surface_mesh/Surface_mesh.h index 3fa750abaf0..491f2747353 100644 --- a/Surface_mesh/include/CGAL/Surface_mesh/Surface_mesh.h +++ b/Surface_mesh/include/CGAL/Surface_mesh/Surface_mesh.h @@ -6,7 +6,7 @@ // // $URL$ // $Id$ -// SPDX-License-Identifier: GPL-3.0-or-later +// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-Commercial //