From c39c55b4f1cafeafe0a9bd57dd56d109d3e13cc1 Mon Sep 17 00:00:00 2001 From: Nico Kruithof Date: Wed, 26 Jun 2013 21:55:51 +0200 Subject: [PATCH] Changed the copyright and the license --- .../CGAL/Periodic_2_Delaunay_triangulation_2.h | 9 +++++---- .../Periodic_2_Delaunay_triangulation_traits_2.h | 13 +++++++------ .../include/CGAL/Periodic_2_offset_2.h | 9 +++++---- .../include/CGAL/Periodic_2_triangulation_2.h | 11 ++++++----- .../CGAL/Periodic_2_triangulation_dummy_12.h | 2 +- .../CGAL/Periodic_2_triangulation_face_base_2.h | 9 +++++---- .../Periodic_2_triangulation_filtered_traits_2.h | 9 +++++---- .../CGAL/Periodic_2_triangulation_hierarchy_2.h | 2 +- ...riodic_2_triangulation_hierarchy_vertex_base_2.h | 2 +- .../CGAL/Periodic_2_triangulation_iterators_2.h | 9 +++++---- ...c_2_triangulation_statically_filtered_traits_2.h | 9 +++++---- .../CGAL/Periodic_2_triangulation_traits_2.h | 9 +++++---- .../CGAL/Periodic_2_triangulation_vertex_base_2.h | 13 +++++++------ .../Static_filters/Periodic_2_orientation_2.h | 10 +++++----- .../Periodic_2_side_of_oriented_circle_2.h | 13 +++++++------ 15 files changed, 70 insertions(+), 59 deletions(-) diff --git a/Periodic_2_triangulation_2/include/CGAL/Periodic_2_Delaunay_triangulation_2.h b/Periodic_2_triangulation_2/include/CGAL/Periodic_2_Delaunay_triangulation_2.h index 49cf27be260..116901efbaf 100644 --- a/Periodic_2_triangulation_2/include/CGAL/Periodic_2_Delaunay_triangulation_2.h +++ b/Periodic_2_triangulation_2/include/CGAL/Periodic_2_Delaunay_triangulation_2.h @@ -1,9 +1,11 @@ +// Copyright (c) 1997-2000 INRIA Sophia-Antipolis (France). // Copyright (c) 2013 Nico Kruithof (The Netherlands) // 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 +// 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. @@ -14,7 +16,6 @@ // $URL$ // $Id$ // -// // Author(s) : Nico Kruithof #ifndef CGAL_PERIODIC_2_DELAUNAY_TRIANGULATION_2_H diff --git a/Periodic_2_triangulation_2/include/CGAL/Periodic_2_Delaunay_triangulation_traits_2.h b/Periodic_2_triangulation_2/include/CGAL/Periodic_2_Delaunay_triangulation_traits_2.h index 2d142a78165..261e8bd1694 100644 --- a/Periodic_2_triangulation_2/include/CGAL/Periodic_2_Delaunay_triangulation_traits_2.h +++ b/Periodic_2_triangulation_2/include/CGAL/Periodic_2_Delaunay_triangulation_traits_2.h @@ -1,9 +1,11 @@ +// Copyright (c) 1997-2000 INRIA Sophia-Antipolis (France). // Copyright (c) 2013 Nico Kruithof (The Netherlands) // 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 +// 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. @@ -11,9 +13,8 @@ // 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: svn+ssh://cgal/svn/cgal/branches/experimental-packages/Periodic_2_triangulation_2/include/CGAL/Periodic_2_triangulation_traits_2.h $ -// $Id: Periodic_2_triangulation_traits_2.h 60448 2010-12-21 15:40:31Z nicokruithof $ -// +// $URL$ +// $Id$ // // Author(s) : Nico Kruithof diff --git a/Periodic_2_triangulation_2/include/CGAL/Periodic_2_offset_2.h b/Periodic_2_triangulation_2/include/CGAL/Periodic_2_offset_2.h index a7c96f464f0..8635c43a584 100644 --- a/Periodic_2_triangulation_2/include/CGAL/Periodic_2_offset_2.h +++ b/Periodic_2_triangulation_2/include/CGAL/Periodic_2_offset_2.h @@ -1,9 +1,11 @@ +// Copyright (c) 1997-2000 INRIA Sophia-Antipolis (France). // Copyright (c) 2013 Nico Kruithof (The Netherlands) // 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 +// 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. @@ -14,7 +16,6 @@ // $URL$ // $Id$ // -// // Author(s) : Nico Kruithof #ifndef CGAL_PERIODIC_2_OFFSET_H diff --git a/Periodic_2_triangulation_2/include/CGAL/Periodic_2_triangulation_2.h b/Periodic_2_triangulation_2/include/CGAL/Periodic_2_triangulation_2.h index 44c68ea1f06..0b5a71f787f 100644 --- a/Periodic_2_triangulation_2/include/CGAL/Periodic_2_triangulation_2.h +++ b/Periodic_2_triangulation_2/include/CGAL/Periodic_2_triangulation_2.h @@ -1,9 +1,11 @@ +// Copyright (c) 1997-2000 INRIA Sophia-Antipolis (France). // Copyright (c) 2013 Nico Kruithof (The Netherlands) -// All rights reserved. +// 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 +// 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. @@ -14,7 +16,6 @@ // $URL$ // $Id$ // -// // Author(s) : Nico Kruithof #ifndef CGAL_PERIODIC_2_TRIANGULATION_2_H diff --git a/Periodic_2_triangulation_2/include/CGAL/Periodic_2_triangulation_dummy_12.h b/Periodic_2_triangulation_2/include/CGAL/Periodic_2_triangulation_dummy_12.h index b0e47fbeb17..871a66976cd 100644 --- a/Periodic_2_triangulation_2/include/CGAL/Periodic_2_triangulation_dummy_12.h +++ b/Periodic_2_triangulation_2/include/CGAL/Periodic_2_triangulation_dummy_12.h @@ -1,3 +1,4 @@ +// Copyright (c) 1997-2000 INRIA Sophia-Antipolis (France). // Copyright (c) 2013 Nico Kruithof (The Netherlands) // All rights reserved. // @@ -15,7 +16,6 @@ // $URL$ // $Id$ // -// // Author(s) : Nico Kruithof #ifndef CGAL_PERIODIC_2_TRIANGULATION_DUMMY_12_H diff --git a/Periodic_2_triangulation_2/include/CGAL/Periodic_2_triangulation_face_base_2.h b/Periodic_2_triangulation_2/include/CGAL/Periodic_2_triangulation_face_base_2.h index 6f2a63170bd..94bd4d92f2f 100644 --- a/Periodic_2_triangulation_2/include/CGAL/Periodic_2_triangulation_face_base_2.h +++ b/Periodic_2_triangulation_2/include/CGAL/Periodic_2_triangulation_face_base_2.h @@ -1,9 +1,11 @@ +// Copyright (c) 1997-2000 INRIA Sophia-Antipolis (France). // Copyright (c) 2013 Nico Kruithof (The Netherlands) // 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 +// 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. @@ -14,7 +16,6 @@ // $URL$ // $Id$ // -// // Author(s) : Nico Kruithof #ifndef CGAL_PERIODIC_2_TRIANGULATION_FACE_BASE_2_H diff --git a/Periodic_2_triangulation_2/include/CGAL/Periodic_2_triangulation_filtered_traits_2.h b/Periodic_2_triangulation_2/include/CGAL/Periodic_2_triangulation_filtered_traits_2.h index 2c5db82f38f..8c8870a75fc 100644 --- a/Periodic_2_triangulation_2/include/CGAL/Periodic_2_triangulation_filtered_traits_2.h +++ b/Periodic_2_triangulation_2/include/CGAL/Periodic_2_triangulation_filtered_traits_2.h @@ -1,9 +1,11 @@ +// Copyright (c) 1997-2000 INRIA Sophia-Antipolis (France). // Copyright (c) 2013 Nico Kruithof (The Netherlands) // 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 +// 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. @@ -14,7 +16,6 @@ // $URL$ // $Id$ // -// // Author(s) : Nico Kruithof #include diff --git a/Periodic_2_triangulation_2/include/CGAL/Periodic_2_triangulation_hierarchy_2.h b/Periodic_2_triangulation_2/include/CGAL/Periodic_2_triangulation_hierarchy_2.h index 856b2c4c588..cc36b0cfef6 100644 --- a/Periodic_2_triangulation_2/include/CGAL/Periodic_2_triangulation_hierarchy_2.h +++ b/Periodic_2_triangulation_2/include/CGAL/Periodic_2_triangulation_hierarchy_2.h @@ -1,3 +1,4 @@ +// Copyright (c) 1997-2000 INRIA Sophia-Antipolis (France). // Copyright (c) 2013 Nico Kruithof (The Netherlands) // All rights reserved. // @@ -15,7 +16,6 @@ // $URL$ // $Id$ // -// // Author(s) : Olivier Devillers // Mariette Yvinec // Nico Kruithof diff --git a/Periodic_2_triangulation_2/include/CGAL/Periodic_2_triangulation_hierarchy_vertex_base_2.h b/Periodic_2_triangulation_2/include/CGAL/Periodic_2_triangulation_hierarchy_vertex_base_2.h index 4aad73cb254..cf2be97c53a 100644 --- a/Periodic_2_triangulation_2/include/CGAL/Periodic_2_triangulation_hierarchy_vertex_base_2.h +++ b/Periodic_2_triangulation_2/include/CGAL/Periodic_2_triangulation_hierarchy_vertex_base_2.h @@ -1,3 +1,4 @@ +// Copyright (c) 1997-2000 INRIA Sophia-Antipolis (France). // Copyright (c) 2013 Nico Kruithof (The Netherlands) // All rights reserved. // @@ -15,7 +16,6 @@ // $URL$ // $Id$ // -// // Author(s) : Olivier Devillers // Mariette Yvinec // Nico Kruithof diff --git a/Periodic_2_triangulation_2/include/CGAL/Periodic_2_triangulation_iterators_2.h b/Periodic_2_triangulation_2/include/CGAL/Periodic_2_triangulation_iterators_2.h index 8449aeade82..32ed2dc25a8 100644 --- a/Periodic_2_triangulation_2/include/CGAL/Periodic_2_triangulation_iterators_2.h +++ b/Periodic_2_triangulation_2/include/CGAL/Periodic_2_triangulation_iterators_2.h @@ -1,9 +1,11 @@ +// Copyright (c) 1997-2000 INRIA Sophia-Antipolis (France). // Copyright (c) 2013 Nico Kruithof (The Netherlands) // 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 +// 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. @@ -14,7 +16,6 @@ // $URL$ // $Id$ // -// // Author(s) : Nico Kruithof #ifndef CGAL_PERIODIC_2_TRIANGULATION_ITERATORS_2_H diff --git a/Periodic_2_triangulation_2/include/CGAL/Periodic_2_triangulation_statically_filtered_traits_2.h b/Periodic_2_triangulation_2/include/CGAL/Periodic_2_triangulation_statically_filtered_traits_2.h index e534c0a6045..b1b73f9933e 100644 --- a/Periodic_2_triangulation_2/include/CGAL/Periodic_2_triangulation_statically_filtered_traits_2.h +++ b/Periodic_2_triangulation_2/include/CGAL/Periodic_2_triangulation_statically_filtered_traits_2.h @@ -1,9 +1,11 @@ +// Copyright (c) 1997-2000 INRIA Sophia-Antipolis (France). // Copyright (c) 2013 Nico Kruithof (The Netherlands) // 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 +// 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. @@ -14,7 +16,6 @@ // $URL$ // $Id$ // -// // Author(s) : Nico Kruithof #ifndef CGAL_PERIODIC_2_TRIANGULATION_STATICALLY_FILTERED_TRAITS_2_H diff --git a/Periodic_2_triangulation_2/include/CGAL/Periodic_2_triangulation_traits_2.h b/Periodic_2_triangulation_2/include/CGAL/Periodic_2_triangulation_traits_2.h index 07213fa3831..a2e7145ecc3 100644 --- a/Periodic_2_triangulation_2/include/CGAL/Periodic_2_triangulation_traits_2.h +++ b/Periodic_2_triangulation_2/include/CGAL/Periodic_2_triangulation_traits_2.h @@ -1,9 +1,11 @@ +// Copyright (c) 1997-2000 INRIA Sophia-Antipolis (France). // Copyright (c) 2013 Nico Kruithof (The Netherlands) // 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 +// 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. @@ -14,7 +16,6 @@ // $URL$ // $Id$ // -// // Author(s) : Nico Kruithof #ifndef CGAL_PERIODIC_2_TRIANGULATION_TRAITS_2_H diff --git a/Periodic_2_triangulation_2/include/CGAL/Periodic_2_triangulation_vertex_base_2.h b/Periodic_2_triangulation_2/include/CGAL/Periodic_2_triangulation_vertex_base_2.h index 0e53a22ee86..1dfcd141b9a 100644 --- a/Periodic_2_triangulation_2/include/CGAL/Periodic_2_triangulation_vertex_base_2.h +++ b/Periodic_2_triangulation_2/include/CGAL/Periodic_2_triangulation_vertex_base_2.h @@ -1,9 +1,11 @@ +// Copyright (c) 1997-2000 INRIA Sophia-Antipolis (France). // Copyright (c) 2013 Nico Kruithof (The Netherlands) // 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 +// 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. @@ -11,9 +13,8 @@ // 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: svn+ssh://nicokruithof@scm.gforge.inria.fr/svnroot/cgal/trunk/Periodic_2_triangulation_2/include/CGAL/Periodic_2_triangulation_vertex_base_2.h $ -// $Id: Periodic_2_triangulation_vertex_base_2.h 56667 2010-06-09 07:37:13Z sloriot $ -// +// $URL$ +// $Id$ // // Author(s) : Monique Teillaud // Manuel Caroli diff --git a/Periodic_2_triangulation_2/include/CGAL/internal/Static_filters/Periodic_2_orientation_2.h b/Periodic_2_triangulation_2/include/CGAL/internal/Static_filters/Periodic_2_orientation_2.h index c0e7f9c2e2e..a89829b2c6b 100644 --- a/Periodic_2_triangulation_2/include/CGAL/internal/Static_filters/Periodic_2_orientation_2.h +++ b/Periodic_2_triangulation_2/include/CGAL/internal/Static_filters/Periodic_2_orientation_2.h @@ -1,10 +1,11 @@ +// Copyright (c) 1997-2000 INRIA Sophia-Antipolis (France). // Copyright (c) 2013 Nico Kruithof (The Netherlands) // 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. +// This file is part of CGAL (www.cgal.org). +// 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. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. @@ -15,7 +16,6 @@ // $URL$ // $Id$ // -// // Author(s) : Nico Kruithof #ifndef CGAL_INTERNAL_STATIC_FILTERS_PERIODIC_2_ORIENTATION_2_H diff --git a/Periodic_2_triangulation_2/include/CGAL/internal/Static_filters/Periodic_2_side_of_oriented_circle_2.h b/Periodic_2_triangulation_2/include/CGAL/internal/Static_filters/Periodic_2_side_of_oriented_circle_2.h index 592ff28f8e8..52117977809 100644 --- a/Periodic_2_triangulation_2/include/CGAL/internal/Static_filters/Periodic_2_side_of_oriented_circle_2.h +++ b/Periodic_2_triangulation_2/include/CGAL/internal/Static_filters/Periodic_2_side_of_oriented_circle_2.h @@ -1,9 +1,11 @@ +// Copyright (c) 1997-2000 INRIA Sophia-Antipolis (France). // Copyright (c) 2013 Nico Kruithof (The Netherlands) // 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 +// 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. @@ -11,9 +13,8 @@ // 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: svn+ssh://nicokruithof@scm.gforge.inria.fr/svnroot/cgal/trunk/Periodic_3_triangulation_3/include/CGAL/internal/Static_filters/Periodic_3_side_of_oriented_sphere_3.h $ -// $Id: Periodic_3_side_of_oriented_sphere_3.h 63134 2011-04-26 17:01:34Z sloriot $ -// +// $URL$ +// $Id$ // // Author(s) : Sylvain Pion // Manuel Caroli