diff options
Diffstat (limited to 'extern/carve/lib/intersection.cpp')
-rw-r--r-- | extern/carve/lib/intersection.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/extern/carve/lib/intersection.cpp b/extern/carve/lib/intersection.cpp index 2aa97131f7f..fe694e32d14 100644 --- a/extern/carve/lib/intersection.cpp +++ b/extern/carve/lib/intersection.cpp @@ -1,13 +1,13 @@ // Begin License: -// Copyright (C) 2006-2011 Tobias Sargeant (tobias.sargeant@gmail.com). +// Copyright (C) 2006-2014 Tobias Sargeant (tobias.sargeant@gmail.com). // All rights reserved. // // This file is part of the Carve CSG Library (http://carve-csg.com/) // -// This file may be used under the terms of the GNU General Public -// License version 2.0 as published by the Free Software Foundation -// and appearing in the file LICENSE.GPL2 included in the packaging of -// this file. +// This file may be used under the terms of either the GNU General +// Public License version 2 or 3 (at your option) as published by the +// Free Software Foundation and appearing in the files LICENSE.GPL2 +// and LICENSE.GPL3 included in the packaging of this file. // // This file is provided "AS IS" with NO WARRANTY OF ANY KIND, // INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR |